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

All changes up to 0.8.11 - Memory leak fixed!

Browse Source
This commit is contained in:
nossr50 2011-03-07 13:32:46 -08:00
parent 2ed3d65ed1
commit ffd71c42a7
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mcMMO/com/gmail/nossr50/mcCombat.java
View File

@ -36,6 +36,9 @@ public class mcCombat {
return; return;
} }
Player defender = (Player)x; Player defender = (Player)x;
//This may help compatability with NPC mods
if(mcUsers.getProfile(defender) == null)
mcUsers.addUser(defender);
if(mcUsers.getProfile(attacker).inParty() && mcUsers.getProfile(defender).inParty()){ if(mcUsers.getProfile(attacker).inParty() && mcUsers.getProfile(defender).inParty()){
if(mcParty.getInstance().inSameParty(defender, attacker)){ if(mcParty.getInstance().inSameParty(defender, attacker)){
event.setCancelled(true); event.setCancelled(true);
@ -833,10 +836,10 @@ public class mcCombat {
} }
} }
public void parryCheck(Player defender, EntityDamageByEntityEvent event, Entity y){ public void parryCheck(Player defender, EntityDamageByEntityEvent event, Entity y){
if(mcm.getInstance().isSwords(defender.getItemInHand()) if(defender != null && mcm.getInstance().isSwords(defender.getItemInHand())
&& event.getDamage() > 0 && event.getDamage() > 0
&& mcPermissions.getInstance().swords(defender)){ && mcPermissions.getInstance().swords(defender)){
if(mcUsers.getProfile(defender).getSwordsInt() >= 50 && mcUsers.getProfile(defender).getSwordsInt() < 250){ if(defender != null && mcUsers.getProfile(defender).getSwordsInt() >= 50 && mcUsers.getProfile(defender).getSwordsInt() < 250){
if(Math.random() * 100 > 95){ if(Math.random() * 100 > 95){
event.setCancelled(true); event.setCancelled(true);
defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*"); defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*");
@ -848,7 +851,7 @@ public class mcCombat {
return; return;
} }
} }
if(mcUsers.getProfile(defender).getSwordsInt() >= 250 && mcUsers.getProfile(defender).getSwordsInt() < 450){ if(defender != null && mcUsers.getProfile(defender).getSwordsInt() >= 250 && mcUsers.getProfile(defender).getSwordsInt() < 450){
if(Math.random() * 100 > 90){ if(Math.random() * 100 > 90){
event.setCancelled(true); event.setCancelled(true);
defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*"); defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*");
@ -860,7 +863,7 @@ public class mcCombat {
return; return;
} }
} }
if(mcUsers.getProfile(defender).getSwordsInt() >= 450 && mcUsers.getProfile(defender).getSwordsInt() < 775){ if(defender != null && mcUsers.getProfile(defender).getSwordsInt() >= 450 && mcUsers.getProfile(defender).getSwordsInt() < 775){
if(Math.random() * 100 > 85){ if(Math.random() * 100 > 85){
event.setCancelled(true); event.setCancelled(true);
defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*"); defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*");
@ -872,7 +875,7 @@ public class mcCombat {
return; return;
} }
} }
if(mcUsers.getProfile(defender).getSwordsInt() >= 775){ if(defender != null && mcUsers.getProfile(defender).getSwordsInt() >= 775){
if(Math.random() * 100 > 80){ if(Math.random() * 100 > 80){
event.setCancelled(true); event.setCancelled(true);
defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*"); defender.sendMessage(ChatColor.YELLOW+"*CLANG* SUCCESSFUL PARRY *CLANG*");

2
mcMMO/com/gmail/nossr50/mcTimer.java
View File

@ -57,6 +57,6 @@ public class mcTimer extends TimerTask{
} else { } else {
thecount = 1; thecount = 1;
} }
//mcCombat.getInstance().bleedSimulate(); mcCombat.getInstance().bleedSimulate();
} }
} }

3
mcMMO/com/gmail/nossr50/mcm.java
View File

@ -321,6 +321,7 @@ public class mcm {
if(split[0].equalsIgnoreCase("/"+mcLoadProperties.mcc)){ if(split[0].equalsIgnoreCase("/"+mcLoadProperties.mcc)){
event.setCancelled(true); event.setCancelled(true);
player.sendMessage(ChatColor.RED+"---[]"+ChatColor.YELLOW+"mcMMO Commands"+ChatColor.RED+"[]---"); player.sendMessage(ChatColor.RED+"---[]"+ChatColor.YELLOW+"mcMMO Commands"+ChatColor.RED+"[]---");
player.sendMessage("/"+mcLoadProperties.stats+ChatColor.RED+" - View your mcMMO stats");
if(mcPermissions.getInstance().party(player)){ if(mcPermissions.getInstance().party(player)){
player.sendMessage(ChatColor.GREEN+"--PARTY COMMANDS--"); player.sendMessage(ChatColor.GREEN+"--PARTY COMMANDS--");
player.sendMessage("/"+mcLoadProperties.party+" [party name] "+ChatColor.RED+"- Create/Join designated party"); player.sendMessage("/"+mcLoadProperties.party+" [party name] "+ChatColor.RED+"- Create/Join designated party");
@ -346,7 +347,7 @@ public class mcm {
if(mcPermissions.getInstance().whois(player)) if(mcPermissions.getInstance().whois(player))
player.sendMessage("/"+mcLoadProperties.whois+" [playername] "+ChatColor.RED+"- View detailed player info"); player.sendMessage("/"+mcLoadProperties.whois+" [playername] "+ChatColor.RED+"- View detailed player info");
if(mcPermissions.getInstance().mmoedit(player)){ if(mcPermissions.getInstance().mmoedit(player)){
player.sendMessage("/"+mcLoadProperties.mmoedit+" [skill] [newvalue] "+ChatColor.RED+"Modify the designated skill value"); //player.sendMessage("/"+mcLoadProperties.mmoedit+" [skill] [newvalue] "+ChatColor.RED+"Modify the designated skill value");
player.sendMessage("/"+mcLoadProperties.mmoedit+" [playername] [skill] [newvalue] "+ChatColor.RED+"- Modify target"); player.sendMessage("/"+mcLoadProperties.mmoedit+" [playername] [skill] [newvalue] "+ChatColor.RED+"- Modify target");
} }
if(mcPermissions.getInstance().mcgod(player)) if(mcPermissions.getInstance().mcgod(player))

2
mcMMO/plugin.yml
View File

@ -1,3 +1,3 @@
name: mcMMO name: mcMMO
main: com.gmail.nossr50.mcMMO main: com.gmail.nossr50.mcMMO
version: 0.8.11 WIP B16 version: 0.8.11