diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5aab277..7c0be0c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,23 +5,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -45,6 +29,9 @@
+
+
+
@@ -52,6 +39,31 @@
+
-
@@ -343,6 +405,7 @@
+
diff --git a/api/src/main/java/me/tofaa/entitylib/meta/MetaConverterRegistry.java b/api/src/main/java/me/tofaa/entitylib/meta/MetaConverterRegistry.java
index 8aacac4..418df24 100644
--- a/api/src/main/java/me/tofaa/entitylib/meta/MetaConverterRegistry.java
+++ b/api/src/main/java/me/tofaa/entitylib/meta/MetaConverterRegistry.java
@@ -80,7 +80,7 @@ final class MetaConverterRegistry {
put(GUARDIAN, GuardianMeta.class, GuardianMeta::new);
put(GIANT, GiantMeta.class, GiantMeta::new);
put(ENDERMITE, EndermiteMeta.class, EndermiteMeta::new);
- put(ENDERMITE, EndermiteMeta.class, EndermiteMeta::new);
+ put(ENDERMAN, EndermanMeta.class, EndermanMeta::new);
put(ELDER_GUARDIAN, ElderGuardianMeta.class, ElderGuardianMeta::new);
put(CREEPER, CreeperMeta.class, CreeperMeta::new);
put(CAVE_SPIDER, CaveSpiderMeta.class, CaveSpiderMeta::new);
@@ -113,7 +113,6 @@ final class MetaConverterRegistry {
put(WANDERING_TRADER, WanderingTraderMeta.class, WanderingTraderMeta::new);
put(CHEST_MINECART, ChestMinecartMeta.class, ChestMinecartMeta::new);
put(COMMAND_BLOCK_MINECART, CommandBlockMinecartMeta.class, CommandBlockMinecartMeta::new);
- put(COMMAND_BLOCK_MINECART, CommandBlockMinecartMeta.class, CommandBlockMinecartMeta::new);
put(FURNACE_MINECART, FurnaceMinecartMeta.class, FurnaceMinecartMeta::new);
put(HOPPER_MINECART, FurnaceMinecartMeta.class, FurnaceMinecartMeta::new);
put(SPAWNER_MINECART, SpawnerMinecartMeta.class, SpawnerMinecartMeta::new);
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java
index 127688f..ad21f86 100644
--- a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java
+++ b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java
@@ -301,6 +301,7 @@ public class WrapperEntity implements Tickable, TrackedEntity {
}
protected WrapperPlayServerSetPassengers createPassengerPacket() {
+ if (passengers.isEmpty()) return null;
return new WrapperPlayServerSetPassengers(entityId, passengers.stream().mapToInt(i -> i).toArray());
}
@@ -352,6 +353,7 @@ public class WrapperEntity implements Tickable, TrackedEntity {
public void refresh() {
if (!spawned) return;
sendPacketToViewers(entityMeta.createPacket());
+ sendPacketToViewers(createPassengerPacket());
}
public void sendPacketToViewers(PacketWrapper packet) {
@@ -365,7 +367,7 @@ public class WrapperEntity implements Tickable, TrackedEntity {
}
private static void sendPacket(UUID user, PacketWrapper wrapper) {
-
+ if (wrapper == null) return;
Object channel = EntityLib.getApi().getPacketEvents().getProtocolManager().getChannel(user);
if (channel == null) {
if (EntityLib.getApi().getSettings().isDebugMode()) {
diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperLivingEntity.java b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperLivingEntity.java
index 91e6090..cfa8069 100644
--- a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperLivingEntity.java
+++ b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperLivingEntity.java
@@ -31,6 +31,7 @@ public class WrapperLivingEntity extends WrapperEntity{
public void refresh() {
super.refresh();
equipment.refresh();
+ attributes.refresh();
}
public WrapperEntityAttributes getAttributes() {
diff --git a/test-plugin/build.gradle b/test-plugin/build.gradle
index f568298..4d089d7 100644
--- a/test-plugin/build.gradle
+++ b/test-plugin/build.gradle
@@ -33,7 +33,8 @@ repositories {
dependencies {
compileOnly('org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT')
compileOnly('com.github.retrooper.packetevents:spigot:2.3.0')
- implementation(project(":platforms:spigot"))
+// implementation(project(":platforms:spigot"))
+ implementation("com.github.Tofaa2.EntityLib:spigot:2.2.0-SNAPSHOT")
}