fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add null checks to potion removal and expiry event handlers, fixes #166

Browse Source
This commit is contained in:
Electroblob77
2019-08-18 20:17:12 +01:00
parent f86ea2334d
commit 831f68d8d9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/potion/ISyncedPotion.java
+2 -2
View File
@@ -52,7 +52,7 @@ public interface ISyncedPotion {
@SubscribeEvent @SubscribeEvent
public static void onPotionExpiryEvent(PotionEvent.PotionExpiryEvent event){ public static void onPotionExpiryEvent(PotionEvent.PotionExpiryEvent event){
if(event.getPotionEffect().getPotion() instanceof ISyncedPotion if(event.getPotionEffect() != null && event.getPotionEffect().getPotion() instanceof ISyncedPotion
&& ((ISyncedPotion)event.getPotionEffect().getPotion()).shouldSync(event.getEntityLiving())){ && ((ISyncedPotion)event.getPotionEffect().getPotion()).shouldSync(event.getEntityLiving())){
if(!event.getEntityLiving().world.isRemote){ if(!event.getEntityLiving().world.isRemote){
@@ -67,7 +67,7 @@ public interface ISyncedPotion {
@SubscribeEvent @SubscribeEvent
public static void onPotionRemoveEvent(PotionEvent.PotionRemoveEvent event){ public static void onPotionRemoveEvent(PotionEvent.PotionRemoveEvent event){
if(event.getPotionEffect().getPotion() instanceof ISyncedPotion if(event.getPotionEffect() != null && event.getPotionEffect().getPotion() instanceof ISyncedPotion
&& ((ISyncedPotion)event.getPotionEffect().getPotion()).shouldSync(event.getEntityLiving())){ && ((ISyncedPotion)event.getPotionEffect().getPotion()).shouldSync(event.getEntityLiving())){
if(!event.getEntityLiving().world.isRemote){ if(!event.getEntityLiving().world.isRemote){