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 into SkyWars

Browse Source
This commit is contained in:
Jeremiah Bishop 2015-06-21 16:17:51 -04:00
commit a05c2d085d
20 changed files with 231 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
View File

@ -54,12 +54,14 @@ public class MotdManager implements Listener, Runnable
public void run()
{
// Add in default MOTD listing to database
if (!_repository.elementExists("MainMotd"))
{
List<String> lines = new ArrayList<String>();
lines.add("§f§lNEW: §a§lMaster Builders§f - §a§lWizards§f - §a§lGravity");
lines.add(" §a§l75% OFF SALE §f§l- §c§lTHIS WEEKEND ONLY");
//lines.add(" §d§lRank Sale §a§l40% Off");
updateMainMotd(" §b§l§m §8§l§m[ §r §9§lMineplex§r §f§lGames§r §8§l§m ]§b§l§m §r", lines);
}
GlobalMotd motd = _repository.getElement("MainMotd");

3
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
View File

@ -14,12 +14,11 @@ public enum Rank
ADMIN("Admin", ChatColor.RED),
SNR_MODERATOR("Sr.Mod", ChatColor.GOLD),
MODERATOR("Mod", ChatColor.GOLD),
JNR_DEV("Jr.Dev", ChatColor.RED),
HELPER("Trainee", ChatColor.DARK_AQUA),
MAPLEAD("MapLead", ChatColor.DARK_PURPLE),
JNR_DEV("Jr.Dev", ChatColor.GOLD),
MAPDEV("Builder", ChatColor.BLUE),
EVENT("Event", ChatColor.WHITE),
//Staff ^^

34
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
View File

@ -20,4 +20,38 @@ public class UtilText
return out;
}
public static boolean isStringSimilar(String newString, String oldString, float matchRequirement)
{
for (int i=0 ; i < newString.length() * matchRequirement ; i++)
{
int matchFromIndex = 0;
//Look for substrings starting at i
for (int j=0 ; j < oldString.length() ; j++)
{
//End of newString
if (i+j > newString.length())
{
break;
}
//Matched
if (newString.charAt(i+j) == oldString.charAt(j))
{
matchFromIndex++;
if (matchFromIndex >= newString.length() * matchRequirement)
return true;
}
//No Match > Reset
else
{
break;
}
}
}
return false;
}
}

18
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
View File

@ -190,9 +190,7 @@ public class CoreClientManager extends MiniPlugin
}
public void loadClientByName(final String playerName, final Runnable runnable)
{
final CoreClient client = Add(playerName);
{
Bukkit.getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
{
public void run()
@ -208,17 +206,21 @@ public class CoreClientManager extends MiniPlugin
if (uuid == null)
uuid = UUIDFetcher.getUUIDOf(playerName);
String response = "";
if (uuid == null)
{
System.out.println("ERROR uuid is null. Can't load client by name.");
return;
response = _repository.getClientByName(playerName);
}
else
{
response = _repository.getClientByUUID(uuid);
}
String response = _repository.getClientByUUID(uuid);
token = gson.fromJson(response, ClientToken.class);
client.SetRank(Rank.valueOf(token.Rank));
CoreClient client = Add(playerName);
client.SetRank(Rank.valueOf(token.Rank));
client.setAccountId(_repository.login(_loginProcessors, uuid.toString(), client.GetPlayerName()));
// JSON sql response

5
Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
View File

@ -267,4 +267,9 @@ public class AccountRepository extends RepositoryBase
}
}), "Error updating player's mysql rank AccountRepository : ");
}
public String getClientByName(String playerName)
{
return new JsonWebCall(_webAddress + "PlayerAccount/GetAccount").ExecuteReturnStream(playerName);
}
}

12
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
View File

@ -203,8 +203,8 @@ public class AchievementManager extends MiniPlugin
return true;
}
public String getMineplexLevel(Player sender, Rank rank)
public int getMineplexLevelNumber(Player sender, Rank rank)
{
int level = get(sender, Achievement.GLOBAL_MINEPLEX_LEVEL).getLevel();
@ -219,8 +219,12 @@ public class AchievementManager extends MiniPlugin
else if (rank.Has(Rank.MODERATOR))
level = Math.max(level, 5);
return Achievement.getExperienceString(level) + " " + ChatColor.RESET;
return level;
}
public String getMineplexLevel(Player sender, Rank rank)
{
return Achievement.getExperienceString(getMineplexLevelNumber(sender, rank)) + " " + ChatColor.RESET;
}
public void setShopEnabled(boolean var)

31
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
View File

@ -25,12 +25,15 @@ import mineplex.core.recharge.Recharge;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.updater.UpdateType;
import mineplex.core.account.CoreClientManager;
import mineplex.core.achievement.AchievementManager;
import mineplex.core.chat.command.BroadcastCommand;
import mineplex.core.chat.command.SilenceCommand;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilText;
import mineplex.core.common.util.UtilTime;
import org.bukkit.entity.Player;
@ -49,6 +52,7 @@ public class Chat extends MiniPlugin
{
private CoreClientManager _clientManager;
private PreferencesManager _preferences;
private AchievementManager _achievements;
private String _filterUrl = "https://10.33.53.5:8003/content/item/moderate";
private String _appId = "34018d65-466d-4a91-8e92-29ca49f022c4";
@ -57,16 +61,18 @@ public class Chat extends MiniPlugin
private int _chatSlow = 0;
private long _silenced = 0;
private boolean _threeSecondDelay = true;
private HashMap<UUID, MessageData> _playerLastMessage = new HashMap<UUID, MessageData>();
public Chat(JavaPlugin plugin, CoreClientManager clientManager, PreferencesManager preferences, String serverName)
public Chat(JavaPlugin plugin, CoreClientManager clientManager, PreferencesManager preferences, AchievementManager achievements, String serverName)
{
super("Chat", plugin);
_clientManager = clientManager;
_serverName = serverName;
_preferences = preferences;
_achievements = achievements;
try
{
@ -301,8 +307,17 @@ public class Chat extends MiniPlugin
event.setCancelled(true);
return;
}
else if (_threeSecondDelay &&
_clientManager.Get(sender).GetRank() == Rank.ALL &&
_achievements.getMineplexLevelNumber(sender, Rank.ALL) < 25 &&
!Recharge.Instance.use(sender, "All Chat Message", 3000, false, false))
{
UtilPlayer.message(sender, C.cYellow + "You can only chat once every 3 seconds to prevent spam.");
UtilPlayer.message(sender, C.cYellow + "Buy a Rank at " + C.cGreen + "www.mineplex.com/shop" + C.cYellow + " to remove this limit!");
event.setCancelled(true);
}
else if (!_clientManager.Get(sender).GetRank().Has(Rank.MODERATOR) &&
!Recharge.Instance.use(sender, "Chat Message", 500, false, false))
!Recharge.Instance.use(sender, "Chat Message", 400, false, false))
{
UtilPlayer.message(sender, F.main("Chat", "You are sending messages too fast."));
event.setCancelled(true);
@ -327,9 +342,9 @@ public class Chat extends MiniPlugin
event.setCancelled(true);
}
else if (!_clientManager.Get(sender).GetRank().Has(Rank.MODERATOR) &&
lastMessage.getMessage().equalsIgnoreCase(event.getMessage()))
UtilText.isStringSimilar(event.getMessage(), lastMessage.getMessage(), 0.8f))
{
UtilPlayer.message(sender, F.main("Chat", "You can't repeat the same message."));
UtilPlayer.message(sender, F.main("Chat", "This message is too similar to your previous message."));
event.setCancelled(true);
}
}
@ -340,7 +355,8 @@ public class Chat extends MiniPlugin
private boolean msgContainsHack(String msg)
{
msg = msg.toLowerCase();
msg = " " + msg.toLowerCase() + " ";
msg.replaceAll("[^a-zA-Z ]", " ");
return (msg.contains(" hack ") ||
msg.contains(" hacker ") ||
@ -586,4 +602,9 @@ public class Chat extends MiniPlugin
{
_playerLastMessage.remove(event.getPlayer().getUniqueId());
}
public void setThreeSecondDelay(boolean b)
{
_threeSecondDelay = b;
}
}

85
Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java Normal file
View File

@ -0,0 +1,85 @@
package mineplex.core.notifier;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.MiniPlugin;
import mineplex.core.account.CoreClientManager;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
public class NotificationManager extends MiniPlugin
{
private boolean _enabled = true;
private CoreClientManager _clientManager;
private String _summerLine =
C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" +
C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" +
C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" +
C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" +
C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" +
C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█" + C.cGold + "█" + C.cYellow + "█";
public NotificationManager(JavaPlugin plugin, CoreClientManager client)
{
super("Notification Manager", plugin);
_clientManager = client;
}
@EventHandler
public void notify(UpdateEvent event)
{
if (!_enabled)
return;
if (event.getType() != UpdateType.MIN_08)
return;
for (Player player : UtilServer.getPlayers())
{
Rank rank = _clientManager.Get(player).GetRank();
if (rank.Has(Rank.LEGEND))
continue;
UtilPlayer.message(player, _summerLine);
UtilPlayer.message(player, " ");
UtilPlayer.message(player, " " +
C.cGreen + C.Bold + "75% OFF" +
C.cYellow + C.Bold + " SUMMER SUPER SALE " +
C.cGreen + C.Bold + "75% OFF");
UtilPlayer.message(player, " ");
if (rank == Rank.ALL)
{
UtilPlayer.message(player, C.cWhite + " " + player.getName() + ", you can get 75% Off " + C.cAqua + C.Bold + "All Lifetime Ranks" + C.cWhite + "!");
UtilPlayer.message(player, C.cWhite + " This is our biggest sale ever, available " + C.cRed + C.Line + "this weekend only" + C.cWhite + "!");
}
else if (rank == Rank.ULTRA)
{
UtilPlayer.message(player, C.cWhite + " Hello " + player.getName() + ", upgrade to " + C.cPurple + C.Bold + "HERO RANK" + C.cWhite + " for only $7.50!");
UtilPlayer.message(player, C.cWhite + " This is our biggest sale ever, available " + C.cRed + C.Line + "this weekend only" + C.cWhite + "!");
}
else if (rank == Rank.HERO)
{
UtilPlayer.message(player, C.cWhite + " Hello " + player.getName() + ", upgrade to " + C.cGreen + C.Bold + "LEGEND RANK" + C.cWhite + " for only $7.50!");
UtilPlayer.message(player, C.cWhite + " This is our biggest sale ever, available " + C.cRed + C.Line + "this weekend only" + C.cWhite + "!");
}
UtilPlayer.message(player, " ");
UtilPlayer.message(player, " " + C.cGreen + "www.mineplex.com/shop");
UtilPlayer.message(player, " ");
//UtilPlayer.message(player, C.cRed + C.Bold + " This Weekend Only!");
UtilPlayer.message(player, _summerLine);
}
}
}

9
Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java
View File

@ -423,6 +423,15 @@ public class Enjin extends MiniPlugin implements CommandExecutor
{
exception.printStackTrace();
}
try
{
Thread.sleep(20);
}
catch (InterruptedException e)
{
e.printStackTrace();
}
}
return true;

2
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
View File

@ -123,7 +123,7 @@ public class Hub extends JavaPlugin implements IRelation
QueueManager queueManager = new QueueManager(this, clientManager, donationManager, new EloManager(this, clientManager), partyManager);
new ServerManager(this, clientManager, donationManager, portal, partyManager, serverStatusManager, hubManager, new StackerManager(hubManager), queueManager);
Chat chat = new Chat(this, clientManager, preferenceManager, serverStatusManager.getCurrentServerName());
Chat chat = new Chat(this, clientManager, preferenceManager, achievementManager, serverStatusManager.getCurrentServerName());
new MessageManager(this, clientManager, preferenceManager, ignoreManager, punish, friendManager, chat);
new MemoryFix(this);
new FileUpdater(this, portal, serverStatusManager.getCurrentServerName(), serverStatusManager.getRegion());

3
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -73,6 +73,7 @@ import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.message.PrivateMessageEvent;
import mineplex.core.mount.MountManager;
import mineplex.core.mount.event.MountActivateEvent;
import mineplex.core.notifier.NotificationManager;
import mineplex.core.party.Party;
import mineplex.core.party.PartyManager;
import mineplex.core.pet.PetManager;
@ -192,6 +193,8 @@ public class HubManager extends MiniClientPlugin<HubClient>
_statsManager = statsManager;
_achievementManager = achievementManager;
_achievementManager.setGiveInterfaceItem(true);
new NotificationManager(getPlugin(), clientManager);
((CraftWorld)Bukkit.getWorlds().get(0)).getHandle().pvpMode = true;

26
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java
View File

@ -20,6 +20,7 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import mineplex.core.common.util.F;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.updater.UpdateType;
import mineplex.core.visibility.VisibilityManager;
import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilBlock;
@ -211,6 +212,10 @@ public class DwarfToss extends SkillActive
UtilPlayer.message(player, F.main(GetClassType().name(), "You picked up " + F.name(UtilEnt.getName(target)) + " with " + F.skill(GetName(level)) + "."));
UtilPlayer.message(target, F.main(GetClassType().name(), F.name(player.getName()) + " grabbed you with " + F.skill(GetName(level)) + "."));
//Hide!
if (target instanceof Player)
VisibilityManager.Instance.setVisibility((Player)target, false, player);
//Event
UtilServer.getServer().getPluginManager().callEvent(new SkillEvent(player, GetName(), ClassType.Brute, target));
@ -301,6 +306,10 @@ public class DwarfToss extends SkillActive
int level = getLevel(cur);
UtilPlayer.message(cur, F.main(GetClassType().name(), F.name(UtilEnt.getName(target)) + " escaped your " + F.skill(GetName(level)) + "."));
//Show!
if (target instanceof Player)
VisibilityManager.Instance.setVisibility((Player)target, true, cur);
}
for (final Player cur : throwSet)
@ -316,6 +325,10 @@ public class DwarfToss extends SkillActive
timeScale = Math.max(0.25, ((double)time/(double)_chargeTime));
}
//Show!
if (target instanceof Player)
VisibilityManager.Instance.setVisibility((Player)target, true, cur);
//Throw
cur.eject();
target.leaveVehicle();
@ -335,8 +348,7 @@ public class DwarfToss extends SkillActive
//Effect
target.playEffect(EntityEffect.HURT);
}
}, 4);
}, 5);
//Inform
UtilPlayer.message(cur, F.main(GetClassType().name(), "You threw " + F.name(UtilEnt.getName(target)) + " with " + F.skill(GetName(level)) + "."));
@ -350,13 +362,19 @@ public class DwarfToss extends SkillActive
player.eject();
player.leaveVehicle();
for (Player cur : _holding.keySet())
{
if (_holding.get(cur).equals(player))
if (cur.equals(player) || _holding.get(cur).equals(player))
{
cur.eject();
_holding.remove(cur);
LivingEntity target = _holding.remove(cur);
_time.remove(cur);
//Show!
if (target instanceof Player)
VisibilityManager.Instance.setVisibility((Player)target, true, cur);
}
}

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java
View File

@ -151,7 +151,7 @@ public class SeismicSlam extends SkillActive
//Velocity
UtilAction.velocity(cur,
UtilAlg.getTrajectory2d(player.getLocation().toVector(), cur.getLocation().toVector()),
0.2 + 1.6 * targets.get(cur), true, 0, 0.2 + 1.2 * targets.get(cur), 1.6, true);
0.4 + 2 * targets.get(cur), true, 0, 0.2 + 1.2 * targets.get(cur), 1.6, true);
//Condition
Factory.Condition().Factory().Falling(GetName(), cur, player, 10, false, true);

3
Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java
View File

@ -3,6 +3,7 @@ package mineplex.staffServer;
import java.util.UUID;
import mineplex.core.account.CoreClientManager;
import mineplex.core.achievement.AchievementManager;
import mineplex.core.antihack.AntiHack;
import mineplex.core.chat.Chat;
import mineplex.core.command.CommandCenter;
@ -57,7 +58,7 @@ public class StaffServer extends JavaPlugin
preferenceManager.GiveItem = false;
Portal portal = new Portal(this, clientManager, serverStatusManager.getCurrentServerName());
new Chat(this, clientManager, preferenceManager, serverStatusManager.getCurrentServerName());
new Chat(this, clientManager, preferenceManager, new AchievementManager(new StatsManager(this, clientManager), clientManager, donationManager), serverStatusManager.getCurrentServerName());
new MemoryFix(this);
new FileUpdater(this, portal, serverStatusManager.getCurrentServerName(), serverStatusManager.getRegion());
AntiHack.Initialize(this, punish, portal, preferenceManager, clientManager);

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

@ -1,6 +1,7 @@
package nautilus.game.arcade;
import java.io.File;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
@ -9,6 +10,7 @@ import net.minecraft.server.v1_7_R4.MinecraftServer;
import mineplex.core.CustomTagFix;
import mineplex.core.TablistFix;
import mineplex.core.account.CoreClientManager;
import mineplex.core.achievement.AchievementManager;
import mineplex.core.antihack.AntiHack;
import mineplex.core.blockrestore.BlockRestore;
import mineplex.core.blood.Blood;
@ -41,6 +43,7 @@ import mineplex.core.projectile.ProjectileManager;
import mineplex.core.punish.Punish;
import mineplex.core.recharge.Recharge;
import mineplex.core.serverConfig.ServerConfiguration;
import mineplex.core.stats.StatsManager;
import mineplex.core.status.ServerStatusManager;
import mineplex.core.teleport.Teleport;
import mineplex.core.updater.FileUpdater;
@ -111,9 +114,10 @@ public class Arcade extends JavaPlugin
AntiHack.Instance.setKick(false);
IgnoreManager ignoreManager = new IgnoreManager(this, _clientManager, preferenceManager, portal);
StatsManager statsManager = new StatsManager(this, _clientManager);
AchievementManager achievementManager = new AchievementManager(statsManager, _clientManager, _donationManager);
FriendManager friendManager = new FriendManager(this, _clientManager, preferenceManager, portal);
Chat chat = new Chat(this, _clientManager, preferenceManager, serverStatusManager.getCurrentServerName());
Chat chat = new Chat(this, _clientManager, preferenceManager, achievementManager, serverStatusManager.getCurrentServerName());
new MessageManager(this, _clientManager, preferenceManager, ignoreManager, punish, friendManager, chat);
BlockRestore blockRestore = new BlockRestore(this);
@ -130,7 +134,7 @@ public class Arcade extends JavaPlugin
cosmeticManager.setInterfaceSlot(7);
//Arcade Manager
_gameManager = new ArcadeManager(this, serverStatusManager, ReadServerConfig(), _clientManager, _donationManager, _damageManager, disguiseManager, creature, teleport, new Blood(this), chat, portal, preferenceManager, inventoryManager, packetHandler, cosmeticManager, projectileManager, petManager, hologramManager, webServerAddress);
_gameManager = new ArcadeManager(this, serverStatusManager, ReadServerConfig(), _clientManager, _donationManager, _damageManager, statsManager, achievementManager, disguiseManager, creature, teleport, new Blood(this), chat, portal, preferenceManager, inventoryManager, packetHandler, cosmeticManager, projectileManager, petManager, hologramManager, webServerAddress);
new MemoryFix(this);
new CustomTagFix(this, packetHandler);

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

@ -63,6 +63,7 @@ import mineplex.core.hologram.HologramManager;
import mineplex.core.inventory.InventoryManager;
import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.movement.Movement;
import mineplex.core.notifier.NotificationManager;
import mineplex.core.packethandler.IPacketHandler;
import mineplex.core.packethandler.PacketHandler;
import mineplex.core.packethandler.PacketInfo;
@ -201,7 +202,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
public ArcadeManager(Arcade plugin, ServerStatusManager serverStatusManager, GameServerConfig serverConfig,
CoreClientManager clientManager, DonationManager donationManager, DamageManager damageManager,
DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, Chat chat,
StatsManager statsManager, AchievementManager achievementManager, DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, Chat chat,
Portal portal, PreferencesManager preferences, InventoryManager inventoryManager, PacketHandler packetHandler,
CosmeticManager cosmeticManager, ProjectileManager projectileManager, PetManager petManager, HologramManager hologramManager, String webAddress)
{
@ -248,9 +249,9 @@ public class ArcadeManager extends MiniPlugin implements IRelation
_packetHandler = packetHandler;
_partyManager = new PartyManager(plugin, portal, _clientManager, preferences);
_statsManager = new StatsManager(plugin, clientManager);
_statsManager = statsManager;
_taskManager = new TaskManager(plugin, clientManager, webAddress);
_achievementManager = new AchievementManager(_statsManager, clientManager, donationManager);
_achievementManager = achievementManager;
_inventoryManager = inventoryManager;
_cosmeticManager = cosmeticManager;
_portal = portal;
@ -284,6 +285,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
new SoupAddon(plugin, this);
new TeamArmorAddon(plugin, this);
new NotificationManager(getPlugin(), clientManager);
//Champions Modules
_energy = new Energy(plugin);

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

@ -123,6 +123,8 @@ public class Draw extends SoloGame
new KeenEyeStatTracker(this),
new PureLuckStatTracker(this)
);
Manager.GetChat().setThreeSecondDelay(false);
}
@Override

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

@ -243,10 +243,10 @@ public class MineStrike extends TeamGame
new String[]
{
C.cAqua + "SWAT" + C.cWhite + " Defend the Bomb Sites",
C.cAqua + "SWAT" + C.cWhite + " Kill the Terrorists",
C.cAqua + "SWAT" + C.cWhite + " Kill the Bombers",
" ",
C.cRed + "Bombers" + C.cWhite + " Plant the Bomb at Bomb Site",
C.cRed + "Bombers" + C.cWhite + " Kill the Counter-Terrorists",
C.cRed + "Bombers" + C.cWhite + " Kill the SWAT Team",
});
_shopManager = new ShopManager(this);

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java
View File

@ -63,6 +63,7 @@ import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.visibility.VisibilityManager;
import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.ArcadeManager;
@ -1197,11 +1198,7 @@ public class SurvivalGamesTeams extends TeamGame
return;
for (Player player : GetPlayers(true))
for (Player other : GetPlayers(true))
{
player.hidePlayer(other);
player.showPlayer(other);
}
VisibilityManager.Instance.refreshPlayerToAll(player);
Announce(C.cRed + C.Bold + "Deathmatch in " + _deathmatchTime + "...");
_deathmatchTime--;

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

@ -160,6 +160,7 @@ public class GameCreationManager implements Listener
// Manager.GetAntiStack().SetEnabled(true);
Manager.getCosmeticManager().setHideParticles(false);
Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.CustomWeaponName);
Manager.GetChat().setThreeSecondDelay(true);
HashMap<String, ChatColor> pastTeams = null;