EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Make the last bug fix compatible with 1.13

Browse Source
This commit is contained in:
nossr50 2019-07-05 06:14:54 -07:00
parent 304a942f51
commit 0b2d0fa332
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -1,6 +1,7 @@
Version 2.1.95 Version 2.1.95
Fixed a bug preventing Wandering Traders from granting XP Fixed a bug preventing Wandering Traders from granting XP
Version 2.1.94 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 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 Fixed a bug where 2 people using Tree Feller could result in the tree being rejected for being too big

4
src/main/java/com/gmail/nossr50/util/Misc.java
View File

@ -67,7 +67,9 @@ public final class Misc {
} }
public static boolean isVillager(Entity entity) { 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) { public static boolean isNPCIncludingVillagers(Entity entity) {