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

More bug fixes

This commit is contained in:
Sam 2017-08-05 22:10:25 +01:00
parent 1591c1592a
commit ebc198f88a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/award/CastleSiegeTesterTrack.java
View File

@ -28,10 +28,12 @@ public class CastleSiegeTesterTrack extends Track
private static final Set<String> OWNERS = Sets.newHashSet( private static final Set<String> OWNERS = Sets.newHashSet(
"ca871a3f-349c-474c-9c45-c36f2e679ab3", // Moppletop "ca871a3f-349c-474c-9c45-c36f2e679ab3", // Moppletop
"852a8acf-7337-40d7-99ec-b08fd99650b5", // KingCrazy_ "852a8acf-7337-40d7-99ec-b08fd99650b5", // KingCrazy_
"a20d59d1-cfd8-4116-ac27-45d9c7eb4a97", // Artix
"3d4b8e73-bc2f-4c62-baaf-78600141794a", // hazeae24 "3d4b8e73-bc2f-4c62-baaf-78600141794a", // hazeae24
"7b133339-2e02-48ef-9dd4-692415933dc5", // Kreshyy "7b133339-2e02-48ef-9dd4-692415933dc5", // Kreshyy
"4e941b23-6e36-48cb-97c4-24f56ea128c1", // DooDooBug25 "4e941b23-6e36-48cb-97c4-24f56ea128c1", // DooDooBug25
"0a4b6d83-8eb0-46aa-bc0f-9b7f04046d52" // Livicus "0a4b6d83-8eb0-46aa-bc0f-9b7f04046d52", // Livicus
"4f8f5380-ffe1-418d-97a4-0737c6edf352" // Hils
); );
public CastleSiegeTesterTrack() public CastleSiegeTesterTrack()

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.java
View File

@ -1,6 +1,5 @@
package nautilus.game.arcade.game.games.castlesiegenew; package nautilus.game.arcade.game.games.castlesiegenew;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -107,7 +106,7 @@ public class CastleSiegeTNTManager implements Listener
location.getWorld().playEffect(location.clone().add(0, 0.5, 0), Effect.STEP_SOUND, Material.TNT); location.getWorld().playEffect(location.clone().add(0, 0.5, 0), Effect.STEP_SOUND, Material.TNT);
} }
@EventHandler @EventHandler(priority = EventPriority.LOW)
public void tntPickup(PlayerInteractEvent event) public void tntPickup(PlayerInteractEvent event)
{ {
if (!UtilEvent.isAction(event, ActionType.R_BLOCK)) if (!UtilEvent.isAction(event, ActionType.R_BLOCK))
@ -123,6 +122,8 @@ public class CastleSiegeTNTManager implements Listener
return; return;
} }
event.setCancelled(true);
DisguiseBase disguise = _host.getArcadeManager().GetDisguise().getActiveDisguise(player); DisguiseBase disguise = _host.getArcadeManager().GetDisguise().getActiveDisguise(player);
if (disguise != null && disguise instanceof DisguiseLiving) if (disguise != null && disguise instanceof DisguiseLiving)

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/NextBestGameManager.java
View File

@ -257,8 +257,6 @@ public class NextBestGameManager implements Listener
return; return;
} }
Managers.get(ArcadeManager.class).getProgressionKitManager().displayKitData(event.GetPlayer());
new BukkitRunnable() new BukkitRunnable()
{ {

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ProgressingKitManager.java
View File

@ -253,7 +253,6 @@ public class ProgressingKitManager implements Listener
if (!game.InProgress() || !(kit instanceof ProgressingKit)) if (!game.InProgress() || !(kit instanceof ProgressingKit))
{ {
player.sendMessage("No in progress");
return; return;
} }
@ -278,7 +277,6 @@ public class ProgressingKitManager implements Listener
if (game.SplitKitXP || dataList == null) if (game.SplitKitXP || dataList == null)
{ {
player.sendMessage("Adding data");
addData(player, game, (ProgressingKit) kit); addData(player, game, (ProgressingKit) kit);
} }
} }
@ -286,10 +284,12 @@ public class ProgressingKitManager implements Listener
@EventHandler @EventHandler
public void onChange(GameStateChangeEvent event) public void onChange(GameStateChangeEvent event)
{ {
if (event.GetState() != GameState.Dead) // Game is over and it actually was live at some point
if (event.GetState() != GameState.Dead || event.GetGame().getGameLiveTime() == 0)
{ {
return; return;
} }
//Upon coming back into the lobby, reset player kits so they don't have to select it again //Upon coming back into the lobby, reset player kits so they don't have to select it again
_manager.getPlugin().getServer().getScheduler().runTaskLater(_manager.getPlugin(), this::resetDefaultKits, 80); _manager.getPlugin().getServer().getScheduler().runTaskLater(_manager.getPlugin(), this::resetDefaultKits, 80);
//Show the data for the previous game //Show the data for the previous game
@ -325,7 +325,6 @@ public class ProgressingKitManager implements Listener
if (dataList == null || xpGained == null) if (dataList == null || xpGained == null)
{ {
player.sendMessage("dataList=" + (dataList == null) + " xpGained=" + (xpGained == null));
return; return;
} }