EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 03:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Fixed stuff being in wrong package. Start of cleanup to m.java.

Browse Source
This commit is contained in:
GJ
2012-03-07 16:38:48 -05:00
parent 3301fc3d9d
commit 9f3e7ba11c
15 changed files with 855 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/main/java/com/gmail/nossr50/skills/Axes.java
View File

@ -23,10 +23,9 @@ import org.bukkit.entity.Player;
import org.bukkit.entity.Wolf;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import com.gmail.nossr50.Combat;
import com.gmail.nossr50.ItemChecks;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.m;
import com.gmail.nossr50.mcPermissions;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
@ -46,7 +45,7 @@ public class Axes {
event.setDamage(event.getDamage() + bonus);
}
public static void axeCriticalCheck(Player attacker, EntityDamageByEntityEvent event, Plugin pluginx)
public static void axeCriticalCheck(Player attacker, EntityDamageByEntityEvent event)
{
Entity x = event.getEntity();
@ -62,7 +61,7 @@ public class Axes {
}
}
PlayerProfile PPa = Users.getProfile(attacker);
if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker)){
if(ItemChecks.isAxe(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker)){
if(PPa.getSkillLevel(SkillType.AXES) >= 750){
if(Math.random() * 2000 <= 750 && !x.isDead()){
if(x instanceof Player){
@ -132,72 +131,4 @@ public class Axes {
}
}
public static void applyAoeDamage(Player attacker, EntityDamageByEntityEvent event, Plugin pluginx)
{
int targets = 0;
int dmgAmount = (event.getDamage()/2);
//Setup minimum damage
if(dmgAmount < 1)
dmgAmount = 1;
if(event.getEntity() instanceof LivingEntity)
{
LivingEntity x = (LivingEntity) event.getEntity();
targets = m.getTier(attacker);
for(Entity derp : x.getNearbyEntities(2.5, 2.5, 2.5))
{
//Make sure the Wolf is not friendly
if(derp instanceof Wolf)
{
Wolf hurrDurr = (Wolf)derp;
if(hurrDurr.getOwner() instanceof Player)
{
Player owner = (Player) hurrDurr.getOwner();
if(owner == attacker)
return;
if(Party.getInstance().inSameParty(attacker, owner))
return;
}
}
//Damage nearby LivingEntities
if(derp instanceof LivingEntity && targets >= 1)
{
if(derp instanceof Player)
{
Player target = (Player)derp;
if(Users.getProfile(target).getGodMode())
continue;
if(target.getName().equals(attacker.getName()))
continue;
if(Party.getInstance().inSameParty(attacker, target))
continue;
if(target.isDead())
continue;
if(targets >= 1 && derp.getWorld().getPVP())
{
Combat.dealDamage(target, dmgAmount, attacker);
target.sendMessage(mcLocale.getString("Axes.HitByCleave"));
targets--;
continue;
}
}
else
{
LivingEntity target = (LivingEntity)derp;
Combat.dealDamage(target, dmgAmount, attacker);
targets--;
}
}
}
}
}
}

2
src/main/java/com/gmail/nossr50/skills/Mining.java
View File

@ -188,7 +188,7 @@ public class Mining
public static void SuperBreakerBlockCheck(Player player, Block block, mcMMO plugin)
{
Material type = block.getType();
int tier = m.getTier(player);
int tier = m.getTier(player.getItemInHand());
int durabilityLoss = LoadProperties.abilityDurabilityLoss;
PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);

22
src/main/java/com/gmail/nossr50/skills/Repair.java
View File

@ -27,8 +27,8 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import com.gmail.nossr50.ItemChecks;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.m;
import com.gmail.nossr50.mcPermissions;
import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.spout.SpoutStuff;
@ -181,11 +181,11 @@ public class Repair {
dif = (short) (dif * modify);
if(!boost)
dif = (short) (dif / modify);
if(m.isShovel(is))
if(ItemChecks.isShovel(is))
dif = (short) (dif / 3);
if(m.isSwords(is))
if(ItemChecks.isSword(is))
dif = (short) (dif / 2);
if(m.isHoe(is))
if(ItemChecks.isHoe(is))
dif = (short) (dif / 2);
PP.addXP(SkillType.REPAIR, dif*10, player);
@ -452,19 +452,19 @@ public class Repair {
short maxDurability = is.getType().getMaxDurability();
int ramt = 0;
if(m.isShovel(is))
if(ItemChecks.isShovel(is))
ramt = maxDurability;
else if(m.isHoe(is) || m.isSwords(is) || is.getTypeId() == 359)
else if(ItemChecks.isHoe(is) || ItemChecks.isSword(is) || is.getTypeId() == 359)
ramt = maxDurability / 2;
else if(m.isAxes(is) || m.isMiningPick(is) || isBow(is))
else if(ItemChecks.isAxe(is) || ItemChecks.isMiningPick(is) || isBow(is))
ramt = maxDurability / 3;
else if(m.isBoots(is))
else if(ItemChecks.isBoots(is))
ramt = maxDurability / 4;
else if(m.isHelmet(is))
else if(ItemChecks.isHelmet(is))
ramt = maxDurability / 5;
else if(m.isPants(is))
else if(ItemChecks.isPants(is))
ramt = maxDurability / 7;
else if(m.isChestplate(is))
else if(ItemChecks.isChestplate(is))
ramt = maxDurability / 8;
return repairCalculate(player, durability, ramt);

2
src/main/java/com/gmail/nossr50/skills/Skills.java
View File

@ -141,7 +141,7 @@ public class Skills
if(skillType != SkillType.ALL)
ps.statVal = PP.getSkillLevel(skillType);
else
ps.statVal = m.getPowerLevel(player);
ps.statVal = m.getPowerLevel(player, PP);
ps.name = player.getName();
Leaderboard.updateLeaderboard(ps, skillType);
}

73
src/main/java/com/gmail/nossr50/skills/Swords.java
View File

@ -22,8 +22,8 @@ import org.bukkit.entity.Player;
import org.bukkit.entity.Wolf;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import com.gmail.nossr50.Combat;
import com.gmail.nossr50.ItemChecks;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.m;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.mcPermissions;
import com.gmail.nossr50.datatypes.PlayerProfile;
@ -49,7 +49,7 @@ public class Swords
return;
}
}
if(mcPermissions.getInstance().swords(attacker) && m.isSwords(attacker.getItemInHand())){
if(mcPermissions.getInstance().swords(attacker) && ItemChecks.isSword(attacker.getItemInHand())){
if(PPa.getSkillLevel(SkillType.SWORDS) >= 750)
{
if(Math.random() * 1000 <= 750)
@ -77,73 +77,6 @@ public class Swords
}
}
}
public static void applySerratedStrikes(Player attacker, EntityDamageByEntityEvent event, mcMMO pluginx)
{
int targets = 0;
int dmgAmount = (event.getDamage()/4);
//Setup minimum damage
if(dmgAmount < 1)
dmgAmount = 1;
if(event.getEntity() instanceof LivingEntity)
{
LivingEntity x = (LivingEntity) event.getEntity();
targets = m.getTier(attacker);
for(Entity derp : x.getNearbyEntities(2.5, 2.5, 2.5))
{
//Make sure the Wolf is not friendly
if(derp instanceof Wolf)
{
Wolf hurrDurr = (Wolf)derp;
if(hurrDurr.getOwner() instanceof Player)
{
Player owner = (Player) hurrDurr.getOwner();
if(owner == attacker)
return;
if(Party.getInstance().inSameParty(attacker, owner))
return;
}
}
//Damage nearby LivingEntities
if(derp instanceof LivingEntity && targets >= 1)
{
if(derp instanceof Player)
{
Player target = (Player)derp;
if(target.getName().equals(attacker.getName()))
continue;
if(Users.getProfile(target).getGodMode())
continue;
if(Party.getInstance().inSameParty(attacker, target))
continue;
if(targets >= 1 && derp.getWorld().getPVP())
{
Combat.dealDamage(target, dmgAmount, attacker);
target.sendMessage(mcLocale.getString("Swords.HitBySerratedStrikes"));
Users.getProfile(target).addBleedTicks(5);
targets--;
continue;
}
}
else
{
if(!pluginx.misc.bleedTracker.contains(derp))
pluginx.misc.addToBleedQue((LivingEntity)derp);
LivingEntity target = (LivingEntity)derp;
Combat.dealDamage(target, dmgAmount, attacker);
targets--;
}
}
}
}
}
public static void counterAttackChecks(EntityDamageByEntityEvent event)
{
@ -159,7 +92,7 @@ public class Swords
{
Player defender = (Player)event.getEntity();
PlayerProfile PPd = Users.getProfile(defender);
if(m.isSwords(defender.getItemInHand()) && mcPermissions.getInstance().swords(defender))
if(ItemChecks.isSword(defender.getItemInHand()) && mcPermissions.getInstance().swords(defender))
{
if(PPd.getSkillLevel(SkillType.SWORDS) >= 600)
{