diff --git a/changelog.txt b/changelog.txt index a3ee271d..0ced6128 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,12 @@ +------------------------------------------------------ +Version 2.1.4 +------------------------------------------------------ +- Fixed a crash when checking if two items could be combined +- Fixed a crash when attempting to open the Sigil of Holding GUI +- Fixed a crash when somebody made an "invalid" stack of the Blood Tank +- Fixed a crash/hilarity where a Blood Altar would update itself as a Comparator + - Thanks to Arcaratus for causing this. I haven't laughed that hard in a while. + ------------------------------------------------------ Version 2.1.3 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index 1546590b..4654e615 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic -mod_version=2.1.3 +mod_version=2.1.4 mc_version=1.11 forge_version=13.19.1.2189 curse_id=224791 @@ -9,4 +9,4 @@ mappings_version=snapshot_20161212 jei_version=4.0.5.203 waila_version=1.8.5-B19 -guideapi_version=2.1.0-47 \ No newline at end of file +guideapi_version=2.1.0-50 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index a4ef11d1..f41e1968 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -159,7 +159,7 @@ public class LivingArmourHandler } } - if (event.getItemStack() != null && event.getItemStack().getItemUseAction() == EnumAction.DRINK) + if (event.getItemStack().getItemUseAction() == EnumAction.DRINK) { ItemStack drinkStack = event.getItemStack();