From f12519d81fd27e6d7ba4b4b32ad9492a1bfaf891 Mon Sep 17 00:00:00 2001 From: Robotia Date: Fri, 4 Mar 2016 23:43:51 -0500 Subject: [PATCH] Fix Datawatcher inability to log in --- patches/net/minecraft/entity/DataWatcher.java.patch | 6 +++--- patches/net/minecraft/inventory/Container.java.patch | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/patches/net/minecraft/entity/DataWatcher.java.patch b/patches/net/minecraft/entity/DataWatcher.java.patch index b21887f6..1773cc1e 100644 --- a/patches/net/minecraft/entity/DataWatcher.java.patch +++ b/patches/net/minecraft/entity/DataWatcher.java.patch @@ -122,7 +122,7 @@ - switch (p_151510_1_.getObjectType()) + int type = p_151510_1_.getObjectType(); + Object object = p_151510_1_.getObject(); -+ int rt = 0; ++ int rt = -1; + if(object instanceof Byte) rt = 0; + else if(object instanceof Short) rt = 1; + else if(object instanceof Integer) rt = 2; @@ -130,9 +130,9 @@ + else if(object instanceof String) rt = 4; + else if(object instanceof ItemStack) rt = 5; + else if(object instanceof ChunkCoordinates) rt = 6; -+ if(type != rt) ++ if(rt != -1 && type != rt) + { -+ System.out.println("[Thermos] Watchable object type is incorrect! Appying correct type!"); ++ System.out.println("[Thermos] Watchable object type "+type+" is incorrect! Appying correct type of " +rt+ "!"); + type = rt; + } + switch (type) diff --git a/patches/net/minecraft/inventory/Container.java.patch b/patches/net/minecraft/inventory/Container.java.patch index ac5e8a07..75772917 100644 --- a/patches/net/minecraft/inventory/Container.java.patch +++ b/patches/net/minecraft/inventory/Container.java.patch @@ -230,4 +230,3 @@ + } + // Spigot } -