JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Treasure painball gun issue, fix parkour paintbull gun issue

Browse Source
This commit is contained in:
Shaun Bennett 2014-09-19 14:18:23 -05:00
parent d0edde9dbd
commit ed85779876
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/treasure/BlockInfo.java
View File

@ -39,4 +39,10 @@ public class BlockInfo
{
return _block.hashCode();
}
@Override
public boolean equals(Object obj)
{
return _block.equals(obj);
}
}

20
Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
View File

@ -388,17 +388,21 @@ public class Treasure
public boolean containsBlock(Block block)
{
if (_wallsBlockInfo.contains(block))
return true;
for (BlockInfo blockInfo : _wallsBlockInfo)
if (blockInfo.equals(block))
return true;
if (_outerRingBlockInfo.contains(block))
return true;
for (BlockInfo blockInfo : _outerRingBlockInfo)
if (blockInfo.equals(block))
return true;
if (_centerBlockInfo.contains(block))
return true;
for (BlockInfo blockInfo : _centerBlockInfo)
if (blockInfo.equals(block))
return true;
if (_chestBlockInfo.contains(block))
return true;
for (BlockInfo blockInfo : _chestBlockInfo)
if (blockInfo.equals(block))
return true;
return false;
}

7
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
View File

@ -28,11 +28,11 @@ import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilEvent;
import mineplex.core.common.util.UtilEvent.ActionType;
import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime;
import mineplex.core.common.util.UtilEvent.ActionType;
import mineplex.core.donation.DonationManager;
import mineplex.core.gadget.event.GadgetActivateEvent;
import mineplex.core.gadget.event.GadgetBlockEvent;
@ -400,14 +400,15 @@ public class ParkourManager extends MiniPlugin
{
for (Iterator<Block> iterator = event.getBlocks().iterator(); iterator.hasNext();)
{
Location location = iterator.next().getLocation();
for (ParkourData data : _parkour)
{
if (data.InBoundary(iterator.next().getLocation()))
if (data.InBoundary(location))
{
iterator.remove();
break;
}
}
}
}
}

2
Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java
View File

@ -85,7 +85,7 @@ public class PollManager extends MiniClientPlugin<PlayerPollData>
if (event.getType() != UpdateType.SLOW)
return;
if (_polls.size() == 0)
if (_polls == null || _polls.size() == 0)
return;
for (Player player : _plugin.getServer().getOnlinePlayers())