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

- Fixed update

Browse Source
This commit is contained in:
AlexTheCoder 2016-02-12 23:03:38 -05:00
parent 197bcc9dbf
commit ea893bfa48
5 changed files with 17 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
View File

@ -70,12 +70,10 @@ public enum GameDisplay
SpeedBuilders("Speed Builders", Material.QUARTZ_BLOCK, (byte) 0, GameCategory.CLASSICS, 60),
<<<<<<< HEAD
Minecraft_League("Minecraft League", Material.DIAMOND_SWORD, (byte)0, GameCategory.SURVIVAL, 59),
Minecraft_League("Minecraft League", Material.DIAMOND_SWORD, (byte)0, GameCategory.SURVIVAL, 61),
=======
ChampionsCTF("Champions CTF", "Champions", Material.BANNER, DyeColor.RED.getDyeData(), GameCategory.CHAMPIONS, 56),
>>>>>>> 70d41b074f9256b4ac0b6fb51b68fb24dcf10e24
BouncyBalls("Bouncy Balls", Material.SLIME_BALL, (byte)0, GameCategory.ARCADE, 57),
Gladiators("Gladiators", Material.IRON_SWORD, (byte)0, GameCategory.ARCADE, 58),
TypeWars("Type Wars", Material.NAME_TAG, (byte) 0, GameCategory.CLASSICS, 59),

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

@ -85,7 +85,7 @@ import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.games.event.EventModule;
import nautilus.game.arcade.game.games.uhc.UHC;
import nautilus.game.arcade.managers.GameAchievementManager;
import nautilus.game.arcade.managers.chat.GameChatManager;
import nautilus.game.arcade.managers.GameChatSettingsManager;
import nautilus.game.arcade.managers.GameCreationManager;
import nautilus.game.arcade.managers.GameFlagManager;
import nautilus.game.arcade.managers.GameGemManager;
@ -99,9 +99,9 @@ import nautilus.game.arcade.managers.GameStatManager;
import nautilus.game.arcade.managers.GameTestingManager;
import nautilus.game.arcade.managers.GameTournamentManager;
import nautilus.game.arcade.managers.GameWorldManager;
import nautilus.game.arcade.managers.HolidayManager;
import nautilus.game.arcade.managers.IdleManager;
import nautilus.game.arcade.managers.MiscManager;
import nautilus.game.arcade.managers.chat.GameChatManager;
import nautilus.game.arcade.player.ArcadePlayer;
import nautilus.game.arcade.shop.ArcadeShop;
@ -139,7 +139,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
private BlockRestore _blockRestore;
private Blood _blood;
private Chat _chat;
private GameChatManager _gamechat;
private GameChatSettingsManager _gamechat;
private CoreClientManager _clientManager;
private DisguiseManager _disguiseManager;
private DonationManager _donationManager;
@ -281,11 +281,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
_arcadeShop = new ArcadeShop(this, clientManager, donationManager);
// Managers
<<<<<<< HEAD
_gamechat = new GameChatManager(this);
=======
_gamechat = new GameChatSettingsManager(this);
_gameChatManager = new GameChatManager(this);
>>>>>>> 70d41b074f9256b4ac0b6fb51b68fb24dcf10e24
_gameCreationManager = new GameCreationManager(this);
_gameGemManager = new GameGemManager(this);
_gameManager = new GameManager(this);
@ -395,7 +392,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
return _chat;
}
public GameChatManager GetGameChat()
public GameChatSettingsManager GetGameChatSettings()
{
return _gamechat;
}

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/MinecraftLeague.java
View File

@ -561,7 +561,7 @@ public class MinecraftLeague extends TeamGame
Manager.GetCreature().SetDisableCustomDrops(true);
_cmd = new MinecraftLeagueCommand(Manager, this);
Manager.addCommand(_cmd);
Manager.GetGameChat().TeamSpy = false;
Manager.GetGameChatSettings().TeamSpy = false;
}
if (event.GetState() == GameState.End)
@ -571,7 +571,7 @@ public class MinecraftLeague extends TeamGame
Manager.GetCreature().SetForce(false);
Manager.GetCreature().SetDisableCustomDrops(false);
Manager.removeCommand(_cmd);
Manager.GetGameChat().TeamSpy = true;
Manager.GetGameChatSettings().TeamSpy = true;
HandlerList.unregisterAll(MapManager);
HandlerList.unregisterAll(_freeze);
}

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java → Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatSettingsManager.java
View File

@ -18,12 +18,12 @@ import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
public class GameChatManager implements Listener
public class GameChatSettingsManager implements Listener
{
ArcadeManager Manager;
public boolean TeamSpy;
public GameChatManager(ArcadeManager manager)
public GameChatSettingsManager(ArcadeManager manager)
{
Manager = manager;

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

@ -29,7 +29,6 @@ import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.GameTeam.PlayerState;
import nautilus.game.arcade.kit.perks.event.PerkDestructorBlockEvent;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.Sound;
@ -902,42 +901,6 @@ public class GameFlagManager implements Listener
if (game.GetType() != GameType.Gravity)
{
<<<<<<< HEAD
UtilPlayer.message(player, C.cRed + C.Bold + "WARNING: " + C.cWhite + C.Bold + "RETURN TO PLAYABLE AREA!");
if (game.GetType() != GameType.Gravity)
{
if (player.getLocation().getY() > game.WorldData.MaxY)
UtilAction.velocity(player, UtilAlg.getTrajectory2d(player.getLocation(), game.GetSpectatorLocation()), 1, true, 0, 0, 10, true);
else
UtilAction.velocity(player, UtilAlg.getTrajectory2d(player.getLocation(), game.GetSpectatorLocation()), 1, true, 0.4, 0, 10, true);
}
Manager.GetDamage().NewDamageEvent(player, null, null,
DamageCause.VOID, 4, false, false, false,
"Border", "Border Damage");
if (!Manager.GetDamage().IsEnabled())
{
EntityDamageEvent e = new EntityDamageEvent(player, DamageCause.VOID, 4);
Bukkit.getPluginManager().callEvent(e);
}
player.getWorld().playSound(player.getLocation(), Sound.NOTE_BASS, 2f, 1f);
player.getWorld().playSound(player.getLocation(), Sound.NOTE_BASS, 2f, 1f);
}
else
{
Manager.GetDamage().NewDamageEvent(player, null, null,
DamageCause.VOID, 9001, false, false, false,
"Border", "Border Damage");
if (!Manager.GetDamage().IsEnabled())
{
EntityDamageEvent e = new EntityDamageEvent(player, DamageCause.VOID, 4);
Bukkit.getPluginManager().callEvent(e);
}
}
=======
if (player.getLocation().getY() > game.WorldData.MaxY)
UtilAction.velocity(player, UtilAlg.getTrajectory2d(player.getLocation(), game.GetSpectatorLocation()), 1, true, 0, 0, 10, true);
else
@ -947,10 +910,14 @@ public class GameFlagManager implements Listener
Manager.GetDamage().NewDamageEvent(player, null, null,
DamageCause.VOID, 4, false, false, false,
"Border", "Border Damage");
if (!Manager.GetDamage().IsEnabled())
{
new EntityDamageEvent(player, DamageCause.VOID, 4);
}
player.getWorld().playSound(player.getLocation(), Sound.NOTE_BASS, 2f, 1f);
player.getWorld().playSound(player.getLocation(), Sound.NOTE_BASS, 2f, 1f);
>>>>>>> 70d41b074f9256b4ac0b6fb51b68fb24dcf10e24
}
else
{
@ -1245,4 +1212,4 @@ public class GameFlagManager implements Listener
UtilTextMiddle.display(C.cGold + C.Bold + Manager.GetGame().GetType().GetName(), "Make sure you accept the Resource Pack", 20, 120, 20, event.getPlayer());
}
}
}