sigonasr2/SigMinecraft
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix an error with the Haste buff not being applied right when getting

Browse Source 
the 5th stat point.
This commit is contained in:
sigonasr2 2013-11-20 16:33:50 -07:00
parent c5a992c418
commit 8166be6614
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java
View File

@ -191,7 +191,7 @@ public class PlayerBuffData {
} }
if (this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat2")>0) { if (this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat2")>0) {
p.removePotionEffect(PotionEffectType.FAST_DIGGING); p.removePotionEffect(PotionEffectType.FAST_DIGGING);
p.addPotionEffect(new PotionEffect(PotionEffectType.FAST_DIGGING,399,this.plugin.getStatBonus(1, this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat2")/4)/20-1)); p.addPotionEffect(new PotionEffect(PotionEffectType.FAST_DIGGING,399,this.plugin.getStatBonus(1, this.plugin.getAccountsConfig().getInt(p.getName()+".stats.stat2")/5)/20-1));
} }
//p.sendMessage("Health: "+p.getHealth()+"/"+p.getMaxHealth()+" Base HP Level: "+base_hplv); //p.sendMessage("Health: "+p.getHealth()+"/"+p.getMaxHealth()+" Base HP Level: "+base_hplv);
if (p.getHealth()>p.getMaxHealth()) { if (p.getHealth()>p.getMaxHealth()) {

21
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
View File

@ -8203,6 +8203,27 @@ implements Listener
@EventHandler @EventHandler
public void onBlockPlace(BlockPlaceEvent e) { public void onBlockPlace(BlockPlaceEvent e) {
Player p = e.getPlayer(); Player p = e.getPlayer();
if (e.getItemInHand().getType()==Material.HOPPER) {
//Check surrounding blocks to verify it's not a chest.
for (int i=-1;i<2;i++) {
for (int j=0;j<2;j++) {
for (int k=-1;k<2;k++) {
if (p.getWorld().getBlockAt(e.getBlockPlaced().getLocation().add(i,j,k)).getType()==Material.CHEST) {
//Check to see if it's a recycling center chest.
for (int l=0;l<this.plugin.recycling_center_list.size();l++) {
for (int m=0;m<this.plugin.recycling_center_list.get(l).locations.size();m++) {
if (this.plugin.recycling_center_list.get(l).locations.get(m).getBlock().equals(p.getWorld().getBlockAt(e.getBlockPlaced().getLocation().add(i,j,k)))) {
e.setCancelled(true);
p.updateInventory();
return;
}
}
}
}
}
}
}
}
if (e.getItemInHand().getType()==Material.PUMPKIN) { if (e.getItemInHand().getType()==Material.PUMPKIN) {
if (e.getBlockPlaced().getWorld().getBlockAt(e.getBlockPlaced().getLocation().add(0,-1,0)).getType()==Material.SNOW_BLOCK && if (e.getBlockPlaced().getWorld().getBlockAt(e.getBlockPlaced().getLocation().add(0,-1,0)).getType()==Material.SNOW_BLOCK &&
e.getBlockPlaced().getWorld().getBlockAt(e.getBlockPlaced().getLocation().add(0,-2,0)).getType()==Material.SNOW_BLOCK) { e.getBlockPlaced().getWorld().getBlockAt(e.getBlockPlaced().getLocation().add(0,-2,0)).getType()==Material.SNOW_BLOCK) {