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

Added checks for pvp in death messages

Browse Source
This commit is contained in:
nossr50 2010-12-02 19:34:35 -08:00
parent 8899f2d4c4
commit f521bd6fe9
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vMinecraftListener.java
View File

@ -109,7 +109,9 @@ public class vMinecraftListener extends PluginListener {
vMinecraftUsers.addUser(player); vMinecraftUsers.addUser(player);
} }
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() && !attacker.isPlayer()){
Player player = (Player)defender;
if(player.getHealth() < 1) {
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){
@ -122,7 +124,31 @@ public class vMinecraftListener extends PluginListener {
damagetype = 5; //Lava damagetype = 5; //Lava
} else if (type == type.WATER){ } else if (type == type.WATER){
damagetype = 6; //Water damagetype = 6; //Water
} } else{
damagetype = 0;
}
if (defender.isPlayer() && attacker.isPlayer()) {
Player pAttacker = (Player)attacker;
Player pDefender = (Player)defender;
damagetype = 0;
vMinecraftChat.gmsg(player, pAttacker.getName() + " has murdered " + pDefender.getName());
}
if (damagetype == 1 && !attacker.isPlayer()){
vMinecraftChat.gmsg(player,player.getName() + Colors.Red + " was blown to bits by a creeper");
} else if (damagetype == 2) {
vMinecraftChat.gmsg(player,player.getName() + Colors.Red + " fell to death!");
} else if (damagetype ==3){
vMinecraftChat.gmsg(player, player.getName() + Colors.Red + " was incinerated");
} else if (damagetype == 4){
vMinecraftChat.gmsg(player, Colors.Red + " Stop drop and roll, not scream, run, and burn " + player.getName());
} else if (damagetype == 5){
vMinecraftChat.gmsg(player, Colors.Red + player.getName() + " drowned in lava");
} else if (damagetype == 6){
vMinecraftChat.gmsg(player, Colors.Blue + player.getName() + " should've attended that swimming class");
} else {
vMinecraftChat.gmsg(player, Colors.Gray + player.getName() + " " + vMinecraftSettings.randomDeathMsg());
}
}
} }
return false; return false;
} }