EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-10-31 09:13:43 +01:00
Code Issues Projects Releases Wiki Activity

Added a null check for attacker in onDamage

Browse Source
This commit is contained in:
nossr50
2010-12-31 09:53:03 -08:00
parent 9f840a3079
commit 3e076d3951
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vMinecraftCommands.java
View File

@@ -48,7 +48,6 @@ public class vMinecraftCommands{
cl.register("/whois", "whois", "/whois [user]"); cl.register("/whois", "whois", "/whois [user]");
cl.register("/say", "say"); cl.register("/say", "say");
cl.register("/a", "adminChatToggle", "Toggle admin chat for every message"); cl.register("/a", "adminChatToggle", "Toggle admin chat for every message");
//cl.register("/modify", "modify");
cl.register("/rules", "rules", "Displays the rules"); cl.register("/rules", "rules", "Displays the rules");
cl.register("/who", "who"); cl.register("/who", "who");
cl.register("/promote", "promote", "Promote a player one rank"); cl.register("/promote", "promote", "Promote a player one rank");

2
vMinecraftListener.java
View File

@@ -167,7 +167,7 @@ public class vMinecraftListener extends PluginListener {
if(vMinecraftSettings.getInstance().isEzModo(dplayer.getName())){ if(vMinecraftSettings.getInstance().isEzModo(dplayer.getName())){
return true; return true;
} }
if(attacker.isPlayer()){ if(attacker != null && attacker.isPlayer()){
Player aplayer = attacker.getPlayer(); Player aplayer = attacker.getPlayer();
if(vMinecraftUsers.getProfile(dplayer).inParty()){ if(vMinecraftUsers.getProfile(dplayer).inParty()){
if(vMinecraftParty.inSameParty(aplayer, dplayer)){ if(vMinecraftParty.inSameParty(aplayer, dplayer)){