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

Potion NPE fix

Browse Source
This commit is contained in:
nossr50 2020-07-13 10:53:36 -07:00
parent 1d1736481c
commit ded7fd5bdf
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -1,3 +1,6 @@
Version 2.1.134
Fixed a NPE that could happen with thrown potions
Version 2.1.133 Version 2.1.133
A fix for an 'array out of bounds' error related to players clicking outside the inventory windows has been fixed A fix for an 'array out of bounds' error related to players clicking outside the inventory windows has been fixed
French locale has been updated (thanks Elikill58) French locale has been updated (thanks Elikill58)

3
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -1061,6 +1061,9 @@ public class EntityListener implements Listener {
if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld())) if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
return; return;
if(event.getPotion().getItem().getItemMeta() == null)
return;
for (PotionEffect effect : ((PotionMeta) event.getPotion().getItem().getItemMeta()).getCustomEffects()) { for (PotionEffect effect : ((PotionMeta) event.getPotion().getItem().getItemMeta()).getCustomEffects()) {
if (!effect.getType().equals(PotionEffectType.SATURATION)) { if (!effect.getType().equals(PotionEffectType.SATURATION)) {
return; return;