fix 1.21

HQService · Oct 4, 2024 · dbe7921 · dbe7921
1 parent 24aa3f1
commit dbe7921
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/modules/bukkit-nms/build.gradle.kts b/modules/bukkit-nms/build.gradle.kts
@@ -12,12 +12,12 @@ dependencies {
     api(libs.exposed.core)
     api(libs.netty)
     api(libs.koin.core)
-    paperweight.paperDevBundle("1.20.6-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21-R0.1-SNAPSHOT")
 
     testImplementationModule("bukkit", "test")
     testImplementation(libs.mockBukkit)
     testImplementation(libs.junit.parameterizedTest)
     testImplementation(libs.kotlinx.coroutines.test)
 }
 
-paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
+//paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
diff --git a/...es/bukkit-nms/src/main/kotlin/kr/hqservice/framework/nms/virtual/AbstractVirtualEntity.kt b/...es/bukkit-nms/src/main/kotlin/kr/hqservice/framework/nms/virtual/AbstractVirtualEntity.kt
@@ -13,13 +13,17 @@ import net.minecraft.network.protocol.game.ClientboundAddEntityPacket
 import net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket
 import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket
 import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket
+import net.minecraft.server.level.ServerEntity
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.server.network.ServerPlayerConnection
 import net.minecraft.world.entity.Entity
 import org.bukkit.Location
 import org.bukkit.inventory.EquipmentSlot
 import org.bukkit.inventory.ItemStack
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
+
 abstract class AbstractVirtualEntity(
     private var location: Location,
     private var name: String,
@@ -138,7 +142,12 @@ abstract class AbstractVirtualEntity(
         if (state mask VirtualEntityState.CREAT) {
             if (!vaild) entityInitialize()
             if (switchState) state = state switch VirtualEntityState.CREAT
-            packets.add(ClientboundAddEntityPacket(getEntity()))
+
+            val npcServerEntity = ServerEntity(
+                getEntity().level() as ServerLevel, getEntity(), 0, false,
+                { packet: Packet<*>? -> }, setOf<ServerPlayerConnection>()
+            )
+            packets.add(ClientboundAddEntityPacket(getEntity(), npcServerEntity))
         }
 
         if (state mask VirtualEntityState.UPDATE_ITEM) {