瀏覽代碼

Make the last bug fix compatible with 1.13

nossr50 6 年之前
父節點
當前提交
0b2d0fa332
共有 2 個文件被更改,包括 4 次插入1 次删除
  1. 1 0
      Changelog.txt
  2. 3 1
      src/main/java/com/gmail/nossr50/util/Misc.java

+ 1 - 0
Changelog.txt

@@ -1,6 +1,7 @@
 Version 2.1.95
     Fixed a bug preventing Wandering Traders from granting XP
 
+
 Version 2.1.94
     2 new devs have joined the mcMMO team (electronicboy, kashike), bringing the active dev team to 3 including myself! Strings relating to authors of mcMMO have been updated to reflect this
     Fixed a bug where 2 people using Tree Feller could result in the tree being rejected for being too big

+ 3 - 1
src/main/java/com/gmail/nossr50/util/Misc.java

@@ -67,7 +67,9 @@ public final class Misc {
     }
 
     public static boolean isVillager(Entity entity) {
-        return (entity instanceof AbstractVillager);
+        String entityType = entity.getType().toString();
+        //This weird code is for 1.13 & 1.14 compatibility
+        return entityType.equalsIgnoreCase("wandering_trader") || entity instanceof Villager;
     }
 
     public static boolean isNPCIncludingVillagers(Entity entity) {