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

Abstracted kicking non-1.8 players

Browse Source 
Abstracted resource pack msg
This commit is contained in:
Mini-Chiss 2015-05-03 16:51:13 -05:00
parent 40d56c3500
commit bd8bd2dfd6
5 changed files with 65 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,6 +255,8 @@ public abstract class Game implements Listener
public boolean CanAddStats = true; public boolean CanAddStats = true;
public boolean CanGiveLoot = true; public boolean CanGiveLoot = true;
public boolean VersionRequire1_8 = false;
public ArrayList<String> GemBoosters = new ArrayList<String>(); public ArrayList<String> GemBoosters = new ArrayList<String>();
private final Set<StatTracker<? extends Game>> _statTrackers = new HashSet<>(); private final Set<StatTracker<? extends Game>> _statTrackers = new HashSet<>();

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/Gravity.java
View File

@ -28,6 +28,7 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityShootBowEvent; import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
@ -112,6 +113,8 @@ public class Gravity extends SoloGame
this.CompassEnabled = true; this.CompassEnabled = true;
this.WorldBoundaryKill = false; this.WorldBoundaryKill = false;
this.VersionRequire1_8 = true;
} }
@Override @Override

35
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
View File

@ -261,6 +261,8 @@ public class MineStrike extends TeamGame
this.JoinInProgress = true; this.JoinInProgress = true;
this.VersionRequire1_8 = true;
_scoreObj = Scoreboard.GetScoreboard().registerNewObjective("HP", "dummy"); _scoreObj = Scoreboard.GetScoreboard().registerNewObjective("HP", "dummy");
_scoreObj.setDisplaySlot(DisplaySlot.BELOW_NAME); _scoreObj.setDisplaySlot(DisplaySlot.BELOW_NAME);
@ -2708,39 +2710,6 @@ public class MineStrike extends TeamGame
} }
} }
@EventHandler
public void joinMessage(PlayerJoinEvent event)
{
if (!UtilPlayer.is1_8(event.getPlayer()))
returnToHub(event.getPlayer());
else
UtilTextMiddle.display(C.cGold + C.Bold + "MineStrike", "Make sure you accept the Resource Pack", 20, 120, 20, event.getPlayer());
}
@EventHandler
public void outdatedVersion(UpdateEvent event)
{
if (event.getType() != UpdateType.SEC)
return;
for (Player player : UtilServer.getPlayers())
{
if (!UtilPlayer.is1_8(player))
returnToHub(player);
}
}
public void returnToHub(Player player)
{
UtilPlayer.message(player, " ");
UtilPlayer.message(player, C.cGold + C.Bold + "Mine-Strike requires you to be using Minecraft 1.8!");
UtilPlayer.message(player, " ");
player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f);
Manager.GetPortal().sendPlayerToServer(player, "Lobby");
}
@EventHandler @EventHandler
public void debug(PlayerCommandPreprocessEvent event) public void debug(PlayerCommandPreprocessEvent event)
{ {

31
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/Wizards.java
View File

@ -20,6 +20,7 @@ import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilInv;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilParticle;
import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.common.util.UtilParticle.ViewDist; import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
@ -166,6 +167,7 @@ public class Wizards extends SoloGame
DisableKillCommand = false; DisableKillCommand = false;
SoupEnabled = false; SoupEnabled = false;
DamageTeamSelf = true; DamageTeamSelf = true;
VersionRequire1_8 = true;
try try
{ {
@ -1030,13 +1032,6 @@ public class Wizards extends SoloGame
} }
} }
@EventHandler
public void joinMessage(PlayerJoinEvent event)
{
if (!UtilPlayer.is1_8(event.getPlayer()))
returnToHub(event.getPlayer());
}
public ItemStack makeBlankWand() public ItemStack makeBlankWand()
{ {
ItemBuilder builder = new ItemBuilder(Material.BLAZE_ROD); ItemBuilder builder = new ItemBuilder(Material.BLAZE_ROD);
@ -1635,18 +1630,6 @@ public class Wizards extends SoloGame
} }
} }
@EventHandler
public void outdatedVersion(UpdateEvent event)
{
if (event.getType() != UpdateType.SEC)
return;
for (Player player : UtilServer.getPlayers())
{
if (!UtilPlayer.is1_8(player))
returnToHub(player);
}
}
@Override @Override
public void ParseData() public void ParseData()
@ -1657,16 +1640,6 @@ public class Wizards extends SoloGame
System.out.print("Endgame event: " + (_endGameEvent == 0 ? "Meteors" : "Lightning")); System.out.print("Endgame event: " + (_endGameEvent == 0 ? "Meteors" : "Lightning"));
} }
public void returnToHub(Player player)
{
UtilPlayer.message(player, " ");
UtilPlayer.message(player, C.cGold + C.Bold + "Wizards requires you to be using Minecraft 1.8!");
UtilPlayer.message(player, " ");
player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f);
Manager.GetPortal().sendPlayerToServer(player, "Lobby");
}
@EventHandler @EventHandler
public void ScoreboardUpdate(UpdateEvent event) public void ScoreboardUpdate(UpdateEvent event)
{ {

55
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
View File

@ -53,6 +53,7 @@ import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.event.player.PlayerPickupItemEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
@ -1127,4 +1128,58 @@ public class GameFlagManager implements Listener
event.setCancelled(true); event.setCancelled(true);
} }
} }
@EventHandler
public void versionUpdateCheck(UpdateEvent event)
{
if (Manager.GetGame() == null)
return;
if (!Manager.GetGame().DisableKillCommand)
return;
if (event.getType() != UpdateType.SEC)
return;
for (Player player : UtilServer.getPlayers())
{
if (!UtilPlayer.is1_8(player))
versionKick(player);
}
}
@EventHandler
public void versionJoinCheck(PlayerJoinEvent event)
{
if (Manager.GetGame() == null)
return;
if (!Manager.GetGame().VersionRequire1_8)
return;
if (!UtilPlayer.is1_8(event.getPlayer()))
versionKick(event.getPlayer());
}
public void versionKick(Player player)
{
UtilPlayer.message(player, " ");
UtilPlayer.message(player, C.cGold + C.Bold + "Gravity requires you to be using Minecraft 1.8!");
UtilPlayer.message(player, " ");
player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f);
Manager.GetPortal().sendPlayerToServer(player, "Lobby");
}
@EventHandler
public void resourceInform(PlayerJoinEvent event)
{
if (Manager.GetGame() == null)
return;
if (Manager.GetGame().GetType().getResourcePackUrl() == null)
return;
UtilTextMiddle.display(C.cGold + C.Bold + Manager.GetGame().GetType().GetName(), "Make sure you accept the Resource Pack", 20, 120, 20, event.getPlayer());
}
} }