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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Jonathan Williams 2015-04-01 02:22:58 -07:00
commit 7a0f9d28bf
11 changed files with 4 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@ import mineplex.core.CustomTagFix;
import mineplex.core.TablistFix; import mineplex.core.TablistFix;
import mineplex.core.account.CoreClientManager; import mineplex.core.account.CoreClientManager;
import mineplex.core.antihack.AntiHack; import mineplex.core.antihack.AntiHack;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.blockrestore.BlockRestore; import mineplex.core.blockrestore.BlockRestore;
import mineplex.core.blood.Blood; import mineplex.core.blood.Blood;
import mineplex.core.command.CommandCenter; import mineplex.core.command.CommandCenter;
@ -136,8 +135,6 @@ public class Arcade extends JavaPlugin
new CustomTagFix(this, packetHandler); new CustomTagFix(this, packetHandler);
new TablistFix(this); new TablistFix(this);
AprilFoolsManager.Initialize(this, _clientManager, disguiseManager);
//Updates //Updates
getServer().getScheduler().scheduleSyncRepeatingTask(this, new Updater(this), 1, 1); getServer().getScheduler().scheduleSyncRepeatingTask(this, new Updater(this), 1, 1);

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

@ -33,7 +33,6 @@ import org.bukkit.util.Vector;
import mineplex.core.MiniPlugin; import mineplex.core.MiniPlugin;
import mineplex.core.account.CoreClientManager; import mineplex.core.account.CoreClientManager;
import mineplex.core.achievement.AchievementManager; import mineplex.core.achievement.AchievementManager;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.blockrestore.BlockRestore; import mineplex.core.blockrestore.BlockRestore;
import mineplex.core.blood.Blood; import mineplex.core.blood.Blood;
import mineplex.core.chat.Chat; import mineplex.core.chat.Chat;
@ -605,10 +604,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation
{ {
String name = event.getPlayer().getName(); String name = event.getPlayer().getName();
// April Fools
if (AprilFoolsManager.Instance.isActive())
name = AprilFoolsManager.Instance.getName(event.getPlayer());
if (_game != null && _game.AnnounceJoinQuit) if (_game != null && _game.AnnounceJoinQuit)
event.setJoinMessage(F.sys("Join", GetColor(event.getPlayer()) + name)); event.setJoinMessage(F.sys("Join", GetColor(event.getPlayer()) + name));
@ -621,10 +616,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation
{ {
String name = event.getPlayer().getName(); String name = event.getPlayer().getName();
// April Fools
if (AprilFoolsManager.Instance.isActive())
name = AprilFoolsManager.Instance.getName(event.getPlayer());
if (_game == null || _game.AnnounceJoinQuit) if (_game == null || _game.AnnounceJoinQuit)
event.setQuitMessage(F.sys("Quit", GetColor(event.getPlayer()) + name)); event.setQuitMessage(F.sys("Quit", GetColor(event.getPlayer()) + name));
else else

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
View File

@ -38,7 +38,6 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilBlock;
@ -145,8 +144,6 @@ public class Bridge extends TeamGame implements OreObsfucation
"The last team alive wins!" "The last team alive wins!"
}); });
AprilFoolsManager.Instance.setEnabled(false);
_ore = new OreHider(); _ore = new OreHider();
// Flags // Flags

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
View File

@ -1,6 +1,5 @@
package nautilus.game.arcade.game.games.champions; package nautilus.game.arcade.game.games.champions;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.minecraft.game.core.combat.DeathMessageType; import mineplex.minecraft.game.core.combat.DeathMessageType;
@ -54,9 +53,7 @@ public class ChampionsDominate extends Domination
"Diamond Weapons deal 7 damage", "Diamond Weapons deal 7 damage",
}; };
AprilFoolsManager.Instance.setEnabled(false);
Manager.GetDamage().UseSimpleWeaponDamage = false; Manager.GetDamage().UseSimpleWeaponDamage = false;
Manager.getCosmeticManager().setHideParticles(true); Manager.getCosmeticManager().setHideParticles(true);

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java
View File

@ -6,7 +6,6 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityShootBowEvent; import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.minecraft.game.core.combat.DeathMessageType; import mineplex.minecraft.game.core.combat.DeathMessageType;
@ -55,9 +54,7 @@ public class ChampionsTDM extends TeamDeathmatch
"Diamond Weapons deal 7 damage", "Diamond Weapons deal 7 damage",
}; };
AprilFoolsManager.Instance.setEnabled(false);
this.Manager.GetDamage().UseSimpleWeaponDamage = false; this.Manager.GetDamage().UseSimpleWeaponDamage = false;
Manager.getCosmeticManager().setHideParticles(true); Manager.getCosmeticManager().setHideParticles(true);

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java
View File

@ -9,14 +9,10 @@ import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockFromToEvent;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilTime;
import mineplex.core.timing.TimingManager;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent;
@ -48,8 +44,6 @@ public class Micro extends TeamGame
"Small game, big strategy!", "Small game, big strategy!",
}); });
AprilFoolsManager.Instance.setEnabled(false);
this.StrictAntiHack = true; this.StrictAntiHack = true;
this.TeamArmor = true; this.TeamArmor = true;

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

@ -57,7 +57,6 @@ import org.bukkit.scoreboard.Team;
import org.bukkit.scoreboard.TeamNameTagVisibility; import org.bukkit.scoreboard.TeamNameTagVisibility;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilAction;
@ -249,8 +248,6 @@ public class MineStrike extends TeamGame
C.cRed + "Al'Jaha" + C.cWhite + " Kill the Counter-Terrorists", C.cRed + "Al'Jaha" + C.cWhite + " Kill the Counter-Terrorists",
}); });
AprilFoolsManager.Instance.setEnabled(false);
_shopManager = new ShopManager(this); _shopManager = new ShopManager(this);
this.StrictAntiHack = true; this.StrictAntiHack = true;

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java
View File

@ -34,7 +34,6 @@ import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
@ -43,7 +42,6 @@ import mineplex.core.common.util.UtilServer;
import mineplex.minecraft.game.core.condition.Condition.ConditionType; import mineplex.minecraft.game.core.condition.Condition.ConditionType;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.visibility.VisibilityManager;
import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType; import nautilus.game.arcade.GameType;
@ -111,9 +109,7 @@ public class Paintball extends TeamGame
"Revive/heal with Water Bombs", "Revive/heal with Water Bombs",
"Last team alive wins!" "Last team alive wins!"
}); });
AprilFoolsManager.Instance.setEnabled(false);
this.StrictAntiHack = true; this.StrictAntiHack = true;
this.HungerSet = 20; this.HungerSet = 20;

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java
View File

@ -29,7 +29,6 @@ import org.bukkit.event.player.PlayerEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerItemHeldEvent; import org.bukkit.event.player.PlayerItemHeldEvent;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilAlg;
@ -142,8 +141,6 @@ public class SheepGame extends TeamGame
"Most sheep at 5 minutes wins!" "Most sheep at 5 minutes wins!"
}); });
AprilFoolsManager.Instance.setEnabled(false);
this.DeathOut = false; this.DeathOut = false;
this.DeathSpectateSecs = 6; this.DeathSpectateSecs = 6;

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
View File

@ -2,7 +2,6 @@ package nautilus.game.arcade.managers;
import java.util.Iterator; import java.util.Iterator;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.Rank; import mineplex.core.common.Rank;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
@ -49,10 +48,6 @@ public class GameChatManager implements Listener
Player sender = event.getPlayer(); Player sender = event.getPlayer();
String senderName = sender.getName(); String senderName = sender.getName();
// April Fools
if (AprilFoolsManager.Instance.isActive())
senderName = AprilFoolsManager.Instance.getName(sender);
//Dead Prefix //Dead Prefix
String dead = ""; String dead = "";
if (Manager.GetGame() != null) if (Manager.GetGame() != null)

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
View File

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilTime;
@ -164,8 +163,7 @@ public class GameCreationManager implements Listener
// Manager.GetAntiStack().SetEnabled(true); // Manager.GetAntiStack().SetEnabled(true);
Manager.getCosmeticManager().setHideParticles(false); Manager.getCosmeticManager().setHideParticles(false);
Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.CustomWeaponName); Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.CustomWeaponName);
AprilFoolsManager.Instance.setEnabled(true);
HashMap<String, ChatColor> pastTeams = null; HashMap<String, ChatColor> pastTeams = null;
//Chosen Game //Chosen Game