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

Moved the damagetype int declarations after the check to see if the attacker is not a player.

Browse Source
This commit is contained in:
nossr50 2010-12-02 19:57:08 -08:00
parent 278c24650a
commit 8b3f83941f
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vMinecraftListener.java
View File

@ -91,10 +91,15 @@ public class vMinecraftListener extends PluginListener {
} }
public boolean onDamage(PluginLoader.DamageType type, BaseEntity attacker, BaseEntity defender, int amount) { public boolean onDamage(PluginLoader.DamageType type, BaseEntity attacker, BaseEntity defender, int amount) {
if(defender.isPlayer()){ if(defender.isPlayer()){
int damagetype = 0; //Set to 0 to begin with int damagetype = 0; //Set to 0 to begin with
Player player = (Player)defender; Player player = (Player)defender;
if(defender.isPlayer() && player.getHealth() < 1 && !attacker.isPlayer()) if (attacker.isPlayer()) {
{ Player pAttacker = (Player)attacker;
if(player.getHealth() < 1){
vMinecraftChat.gmsg(player, pAttacker.getName() + " has murdered " + player.getName());
}
}
if (player.getHealth() < 1 && !attacker.isPlayer()) {
if (type == type.CREEPER_EXPLOSION) { if (type == type.CREEPER_EXPLOSION) {
damagetype = 1; //Creeper damagetype = 1; //Creeper
} else if(type == type.FALL){ } else if(type == type.FALL){
@ -108,18 +113,6 @@ public class vMinecraftListener extends PluginListener {
} else if (type == type.WATER){ } else if (type == type.WATER){
damagetype = 6; //Water damagetype = 6; //Water
} }
}
if (defender.isPlayer() && attacker.isPlayer()) {
Player pAttacker = (Player)attacker;
Player pDefender = (Player)defender;
if(pDefender.getHealth() < 1){
damagetype =0; //Reset damagetype to 0
vMinecraftChat.gmsg(player, pAttacker.getName() + " has murdered " + pDefender.getName());
}
}
if (player.getHealth() < 1 && !attacker.isPlayer()) {
if (damagetype == 1){
vMinecraftChat.gmsg(player,player.getName() + Colors.Red + " was blown to bits by a creeper"); vMinecraftChat.gmsg(player,player.getName() + Colors.Red + " was blown to bits by a creeper");
} else if (damagetype == 2) { } else if (damagetype == 2) {
vMinecraftChat.gmsg(player,player.getName() + Colors.Red + " fell to death!"); vMinecraftChat.gmsg(player,player.getName() + Colors.Red + " fell to death!");
@ -134,7 +127,6 @@ public class vMinecraftListener extends PluginListener {
} else { } else {
vMinecraftChat.gmsg(player, Colors.Gray + player.getName() + " " + vMinecraftSettings.randomDeathMsg()); vMinecraftChat.gmsg(player, Colors.Gray + player.getName() + " " + vMinecraftSettings.randomDeathMsg());
} }
}
} }
return false; return false;
} }