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

Map crumble issue

Browse Source 
Fixes an issue where the max distance of a map would not be calculated
correctly affecting the map crumble
This commit is contained in:
Sam 2016-07-24 00:12:48 +01:00
parent faece2c5f8
commit 03b3c1864d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
View File

@ -215,6 +215,7 @@ public abstract class Skywars extends Game
setupMiddleLoot(); setupMiddleLoot();
} }
@Override
public void ParseData() public void ParseData()
{ {
parseCreateZombieSpawns(); parseCreateZombieSpawns();
@ -471,7 +472,7 @@ public abstract class Skywars extends Game
} }
if (bestBlock.getType() == Material.WOODEN_DOOR || bestBlock.getType() == Material.IRON_DOOR_BLOCK) if (bestBlock.getType() == Material.WOODEN_DOOR || bestBlock.getType() == Material.IRON_DOOR_BLOCK)
{ {
MapUtil.QuickChangeBlockAt(bestBlock.getLocation().add(0, 1, 0), Material.AIR); MapUtil.QuickChangeBlockAt(bestBlock.getRelative(BlockFace.UP).getLocation(), Material.AIR);
} }
MapUtil.QuickChangeBlockAt(bestBlock.getLocation(), Material.AIR); MapUtil.QuickChangeBlockAt(bestBlock.getLocation(), Material.AIR);
} }
@ -876,9 +877,12 @@ public abstract class Skywars extends Game
@EventHandler @EventHandler
public void onBlockPhysics(BlockPhysicsEvent event) public void onBlockPhysics(BlockPhysicsEvent event)
{
if (IsLive())
{ {
_worldBlocks.add(event.getBlock()); _worldBlocks.add(event.getBlock());
} }
}
@EventHandler @EventHandler
public void onBlockBreakBonusDrops(BlockBreakEvent event) public void onBlockBreakBonusDrops(BlockBreakEvent event)

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
View File

@ -1,8 +1,8 @@
package nautilus.game.arcade.kit; package nautilus.game.arcade.kit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -56,7 +56,7 @@ public abstract class ProgressingKit extends Kit implements ProgressiveKit
private String _internalName; private String _internalName;
private PlayerKitDataManager _dataManager; private PlayerKitDataManager _dataManager;
private HashMap<Integer, ArrayList<KitAbilityDetail>> _kitAbilityDetails; private Map<Integer, List<KitAbilityDetail>> _kitAbilityDetails;
private Perk[][] _perks; private Perk[][] _perks;
public ProgressingKit(ArcadeManager manager, String name, String internalName, KitAvailability kitAvailability, String[] kitDesc, Perk[][] kitPerks, EntityType entityType, ItemStack itemInHand) public ProgressingKit(ArcadeManager manager, String name, String internalName, KitAvailability kitAvailability, String[] kitDesc, Perk[][] kitPerks, EntityType entityType, ItemStack itemInHand)
@ -139,7 +139,7 @@ public abstract class ProgressingKit extends Kit implements ProgressiveKit
} }
@Override @Override
public HashMap<Integer, ArrayList<KitAbilityDetail>> getAbilityDetails() public Map<Integer, List<KitAbilityDetail>> getAbilityDetails()
{ {
return _kitAbilityDetails; return _kitAbilityDetails;
} }