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

Version 1.0.41

Browse Source
This commit is contained in:
nossr50 2011-07-21 06:35:49 -07:00
parent 7901402c44
commit ace14e83d1
7 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mcMMO/Changelog.txt
View File

@ -1,5 +1,10 @@
Changelog: Changelog:
#Versions without changelogs probably had very small misc fixes, like tweaks to the source code #Versions without changelogs probably had very small misc fixes, like tweaks to the source code
Version 1.0.41
Fixed errors using Tree Feller if your server wasn't running BukkitContrib (sorry!)
Fixed some more leftover stuff involving the new half-finished mining skill
Fixed excavation's Giga Drill Breaker not working on placed blocks
Version 1.0.40 Version 1.0.40
Fixed errors if your server wasn't running BukkitContrib Fixed errors if your server wasn't running BukkitContrib

19
mcMMO/com/gmail/nossr50/Combat.java
View File

@ -115,22 +115,6 @@ public class Combat
if(event.getEntity() instanceof Ghast) if(event.getEntity() instanceof Ghast)
xp = (event.getDamage() * 3) * LoadProperties.xpGainMultiplier; xp = (event.getDamage() * 3) * LoadProperties.xpGainMultiplier;
if(pluginx.mob.mobDiff.containsKey(event.getEntity().getEntityId()))
{
pluginx.mob.isAggressive.put(event.getEntity().getEntityId(), true);
//ARMOR REDUCTION BASED ON ENEMY RANKING
int modifiedDmg = event.getDamage() / (pluginx.mob.mobDiff.get(event.getEntity().getEntityId())+1);
if(modifiedDmg < 1)
modifiedDmg = 1;
event.setDamage(modifiedDmg);
}
//ADJUST TO DIFFICULTY
if(pluginx.mob.mobDiff.containsKey(event.getEntity().getEntityId()))
{
xp = xp * (pluginx.mob.mobDiff.get(event.getEntity().getEntityId())+1);
}
if(m.isSwords(attacker.getItemInHand()) && mcPermissions.getInstance().swords(attacker)) if(m.isSwords(attacker.getItemInHand()) && mcPermissions.getInstance().swords(attacker))
PPa.addXP(SkillType.SWORDS, xp); PPa.addXP(SkillType.SWORDS, xp);
else if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker)) else if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker))
@ -348,7 +332,8 @@ public class Combat
/* /*
* Defender is Monster * Defender is Monster
*/ */
if(x instanceof Monster){ if(!pluginx.misc.mobSpawnerList.contains(x) && x instanceof Monster)
{
//XP //XP
if(x instanceof Creeper) if(x instanceof Creeper)
PPa.addXP(SkillType.ARCHERY, (event.getDamage() * 4) * LoadProperties.xpGainMultiplier); PPa.addXP(SkillType.ARCHERY, (event.getDamage() * 4) * LoadProperties.xpGainMultiplier);

12
mcMMO/com/gmail/nossr50/listeners/mcBlockListener.java
View File

@ -230,8 +230,8 @@ public class mcBlockListener extends BlockListener {
/* /*
* EXCAVATION * EXCAVATION
*/ */
if(mcPermissions.getInstance().excavation(player) && block.getData() != (byte) 5) if(mcPermissions.getInstance().excavation(player))
Excavation.excavationProcCheck(block.getTypeId(), block.getLocation(), player); Excavation.excavationProcCheck(block.getData(), block.getTypeId(), block.getLocation(), player);
/* /*
* HERBALISM * HERBALISM
*/ */
@ -314,7 +314,7 @@ public class mcBlockListener extends BlockListener {
/* /*
* TREE FELLAN STUFF * TREE FELLAN STUFF
*/ */
if(block.getTypeId() == 17 && Users.getProfile(player).getTreeFellerMode()) if(LoadProperties.contribEnabled && block.getTypeId() == 17 && Users.getProfile(player).getTreeFellerMode())
contribStuff.playSoundForPlayer(SoundEffect.FIZZ, player, block.getLocation()); contribStuff.playSoundForPlayer(SoundEffect.FIZZ, player, block.getLocation());
/* /*
@ -328,14 +328,14 @@ public class mcBlockListener extends BlockListener {
* GIGA DRILL BREAKER CHECKS * GIGA DRILL BREAKER CHECKS
*/ */
if(PP.getGigaDrillBreakerMode() && m.blockBreakSimulate(block, player, plugin) if(PP.getGigaDrillBreakerMode() && m.blockBreakSimulate(block, player, plugin)
&& Excavation.canBeGigaDrillBroken(block) && m.isShovel(inhand) && Excavation.canBeGigaDrillBroken(block) && m.isShovel(inhand))
&& block.getData() != (byte) 5){ {
int x = 1; int x = 1;
while(x < 4) while(x < 4)
{ {
Excavation.excavationProcCheck(block.getTypeId(), block.getLocation(), player); Excavation.excavationProcCheck(block.getData(), block.getTypeId(), block.getLocation(), player);
x++; x++;
} }

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

@ -645,7 +645,8 @@ public class mcMMO extends JavaPlugin
player.sendMessage(ChatColor.GREEN+"If you like my work you can donate via Paypal: nossr50@gmail.com"); player.sendMessage(ChatColor.GREEN+"If you like my work you can donate via Paypal: nossr50@gmail.com");
} }
} }
else if(LoadProperties.mccEnable && label.equalsIgnoreCase(LoadProperties.mcc)){ else if(LoadProperties.mccEnable && label.equalsIgnoreCase(LoadProperties.mcc))
{
player.sendMessage(ChatColor.RED+"---[]"+ChatColor.YELLOW+"mcMMO Commands"+ChatColor.RED+"[]---"); player.sendMessage(ChatColor.RED+"---[]"+ChatColor.YELLOW+"mcMMO Commands"+ChatColor.RED+"[]---");
if(mcPermissions.getInstance().party(player)){ if(mcPermissions.getInstance().party(player)){
player.sendMessage(mcLocale.getString("m.mccPartyCommands")); player.sendMessage(mcLocale.getString("m.mccPartyCommands"));

4
mcMMO/com/gmail/nossr50/skills/Excavation.java
View File

@ -63,11 +63,13 @@ public class Excavation
return false; return false;
} }
} }
public static void excavationProcCheck(int type, Location loc, Player player) public static void excavationProcCheck(byte data, int type, Location loc, Player player)
{ {
PlayerProfile PP = Users.getProfile(player); PlayerProfile PP = Users.getProfile(player);
ItemStack is = null; ItemStack is = null;
Material mat = null; Material mat = null;
if(data != (byte) 5)
return;
if(type == 2) if(type == 2)
{ {

31
mcMMO/com/gmail/nossr50/skills/Mining.java
View File

@ -169,19 +169,21 @@ public class Mining {
loc.getWorld().dropItemNaturally(loc, item); loc.getWorld().dropItemNaturally(loc, item);
} }
} }
public static void blockProcCheck(Block block, Player player) /*
public static void blockProcSmeltCheck(Block block, Player player)
{ {
PlayerProfile PP = Users.getProfile(player); PlayerProfile PP = Users.getProfile(player);
if(player != null) if(player != null)
{ {
if(Math.random() * 1000 <= PP.getSkillLevel(SkillType.MINING)) if(Math.random() * 1000 <= PP.getSkillLevel(SkillType.MINING))
{ {
blockProcSimulate(block); blockProcSmeltSimulate(block);
return; return;
} }
} }
} }
public static void blockProcSmeltCheck(Block block, Player player) */
public static void blockProcCheck(Block block, Player player)
{ {
PlayerProfile PP = Users.getProfile(player); PlayerProfile PP = Users.getProfile(player);
if(player != null) if(player != null)
@ -199,12 +201,13 @@ public class Mining {
if(plugin.misc.blockWatchList.contains(block) || block.getData() == (byte) 5) if(plugin.misc.blockWatchList.contains(block) || block.getData() == (byte) 5)
return; return;
int xp = 0; int xp = 0;
if(block.getTypeId() == 1 || block.getTypeId() == 24){ if(block.getTypeId() == 1 || block.getTypeId() == 24)
{
xp += LoadProperties.mstone; xp += LoadProperties.mstone;
if(smelt = false) if(smelt = false)
blockProcCheck(block, player); blockProcCheck(block, player);
else else
blockProcSmeltCheck(block, player); blockProcCheck(block, player);
} }
//OBSIDIAN //OBSIDIAN
if(block.getTypeId() == 49) if(block.getTypeId() == 49)
@ -213,7 +216,7 @@ public class Mining {
if(smelt = false) if(smelt = false)
blockProcCheck(block, player); blockProcCheck(block, player);
else else
blockProcSmeltCheck(block, player); blockProcCheck(block, player);
} }
//NETHERRACK //NETHERRACK
if(block.getTypeId() == 87) if(block.getTypeId() == 87)
@ -222,7 +225,7 @@ public class Mining {
if(smelt = false) if(smelt = false)
blockProcCheck(block, player); blockProcCheck(block, player);
else else
blockProcSmeltCheck(block, player); blockProcCheck(block, player);
} }
//GLOWSTONE //GLOWSTONE
if(block.getTypeId() == 89) if(block.getTypeId() == 89)
@ -231,7 +234,7 @@ public class Mining {
if(smelt = false) if(smelt = false)
blockProcCheck(block, player); blockProcCheck(block, player);
else else
blockProcSmeltCheck(block, player); blockProcCheck(block, player);
} }
//COAL //COAL
if(block.getTypeId() == 16) if(block.getTypeId() == 16)
@ -240,7 +243,7 @@ public class Mining {
if(smelt = false) if(smelt = false)
blockProcCheck(block, player); blockProcCheck(block, player);
else else
blockProcSmeltCheck(block, player); blockProcCheck(block, player);
} }
//GOLD //GOLD
if(block.getTypeId() == 14) if(block.getTypeId() == 14)
@ -249,7 +252,7 @@ public class Mining {
if(smelt = false) if(smelt = false)
blockProcCheck(block, player); blockProcCheck(block, player);
else else
blockProcSmeltCheck(block, player); blockProcCheck(block, player);
} }
//DIAMOND //DIAMOND
if(block.getTypeId() == 56){ if(block.getTypeId() == 56){
@ -257,7 +260,7 @@ public class Mining {
if(smelt = false) if(smelt = false)
blockProcCheck(block, player); blockProcCheck(block, player);
else else
blockProcSmeltCheck(block, player); blockProcCheck(block, player);
} }
//IRON //IRON
if(block.getTypeId() == 15) if(block.getTypeId() == 15)
@ -266,7 +269,7 @@ public class Mining {
if(smelt = false) if(smelt = false)
blockProcCheck(block, player); blockProcCheck(block, player);
else else
blockProcSmeltCheck(block, player); blockProcCheck(block, player);
} }
//REDSTONE //REDSTONE
if(block.getTypeId() == 73 || block.getTypeId() == 74) if(block.getTypeId() == 73 || block.getTypeId() == 74)
@ -275,7 +278,7 @@ public class Mining {
if(smelt = false) if(smelt = false)
blockProcCheck(block, player); blockProcCheck(block, player);
else else
blockProcSmeltCheck(block, player); blockProcCheck(block, player);
} }
//LAPUS //LAPUS
if(block.getTypeId() == 21) if(block.getTypeId() == 21)
@ -284,7 +287,7 @@ public class Mining {
if(smelt = false) if(smelt = false)
blockProcCheck(block, player); blockProcCheck(block, player);
else else
blockProcSmeltCheck(block, player); blockProcCheck(block, player);
} }
PP.addXP(SkillType.MINING, xp * LoadProperties.xpGainMultiplier); PP.addXP(SkillType.MINING, xp * LoadProperties.xpGainMultiplier);
Skills.XpCheckSkill(SkillType.MINING, player); Skills.XpCheckSkill(SkillType.MINING, player);

2
mcMMO/plugin.yml
View File

@ -1,6 +1,6 @@
name: mcMMO name: mcMMO
main: com.gmail.nossr50.mcMMO main: com.gmail.nossr50.mcMMO
version: 1.0.40 version: 1.0.41
commands: commands:
mcc: mcc:
description: Lists mcMMO commands description: Lists mcMMO commands