1.10.2 Update

LOOHP · Apr 22, 2020 · 767b655 · 767b655
1 parent 1f808ac
commit 767b655
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/com/loohp/interactionvisualizer/Manager/PacketManager.java b/src/com/loohp/interactionvisualizer/Manager/PacketManager.java
@@ -323,7 +323,7 @@ public static void updateArmorStand(List<Player> players, ArmorStand entity, boo
 	public static void removeArmorStand(List<Player> players, ArmorStand entity, boolean removeFromActive) {
 		if (removeFromActive) {
 			active.remove(entity);
-			active.remove(entity);
+			loaded.remove(entity);
 		}
 
 		PacketContainer packet1 = protocolManager.createPacket(PacketType.Play.Server.ENTITY_DESTROY);

diff --git a/src/com/loohp/interactionvisualizer/Protocol/WatchableCollection.java b/src/com/loohp/interactionvisualizer/Protocol/WatchableCollection.java
@@ -46,7 +46,11 @@ public static WrappedDataWatcher getWatchableCollection(ArmorStand stand) {
 
 		switch (metaversion) {
 		case 0:
-			watcher.setObject(new WrappedDataWatcherObject(2, stringSerializer), stand.getCustomName());
+			if (stand.getCustomName() != null && !stand.getCustomName().equals("")) {
+				watcher.setObject(new WrappedDataWatcherObject(2, stringSerializer), stand.getCustomName());
+			} else {
+				watcher.setObject(new WrappedDataWatcherObject(2, stringSerializer), "");
+			}
 			break;
 		case 1:
 		case 2:
@@ -116,7 +120,11 @@ public static WrappedDataWatcher getWatchableCollection(Item item) {
 
 		switch (metaversion) {
 		case 0:
-			watcher.setObject(new WrappedDataWatcherObject(2, stringSerializer), item.getCustomName());
+			if (item.getCustomName() != null && !item.getCustomName().equals("")) {
+				watcher.setObject(new WrappedDataWatcherObject(2, stringSerializer), item.getCustomName());
+			} else {
+				watcher.setObject(new WrappedDataWatcherObject(2, stringSerializer), "");
+			}
 			break;
 		case 1:
 		case 2:

diff --git a/src/plugin.yml b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: InteractionVisualizer
 author: loohp
-version: 1.10.1
+version: 1.10.2
 main: com.loohp.interactionvisualizer.InteractionVisualizer
 api-version: 1.13
 description: Makes function blocks better