From c1de12a8e7e91d76357807360e51ac23906fdaa3 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sat, 16 Nov 2013 02:59:28 -0800 Subject: [PATCH] Added autoreconnect to bungee repos Fixed up disguise for block hunt. --- .../bungee/lobbyBalancer/LobbyBalancerRepository.java | 2 +- .../src/mineplex/bungee/motd/MotdRepository.java | 2 +- .../bungee/playerCount/PlayerCountRepository.java | 2 +- Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java | 11 ++++++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java index b0dbfe263..e01b52f0f 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java @@ -10,7 +10,7 @@ import java.util.List; public class LobbyBalancerRepository { - private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/ServerStatus"; + private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/ServerStatus?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; private String _userName = "root"; private String _password = "tAbechAk3wR7tuTh"; private boolean _us; diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java index c6b79399e..79f311eb0 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java @@ -8,7 +8,7 @@ import java.sql.SQLException; public class MotdRepository { - private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/BungeeServers"; + private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/BungeeServers?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; private String _userName = "root"; private String _password = "tAbechAk3wR7tuTh"; diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCountRepository.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCountRepository.java index dccb1be82..a1f55d581 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCountRepository.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCountRepository.java @@ -9,7 +9,7 @@ import java.sql.Statement; public class PlayerCountRepository { - private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/BungeeServers"; + private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/BungeeServers?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; private String _userName = "root"; private String _password = "tAbechAk3wR7tuTh"; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index acce3f174..188e88405 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -44,6 +44,7 @@ import mineplex.core.common.util.UtilWorld; import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.disguise.DisguiseManager; import mineplex.core.disguise.disguises.DisguisePlayer; +import mineplex.core.disguise.disguises.DisguiseSlime; import mineplex.core.donation.DonationManager; import mineplex.core.portal.Portal; import mineplex.core.task.TaskManager; @@ -178,6 +179,14 @@ public class HubManager extends MiniClientPlugin { _disguiseManager.disguise(new DisguisePlayer(entity, ChatColor.YELLOW + "MineKart")); } + else if (ChatColor.stripColor(((LivingEntity)entity).getCustomName()).equalsIgnoreCase("Block Hunt")) + { + DisguiseSlime disguise = new DisguiseSlime(entity); + disguise.SetCustomNameVisible(true); + disguise.SetName(((LivingEntity)entity).getCustomName()); + disguise.SetSize(2); + _disguiseManager.disguise(disguise); + } } } } @@ -359,7 +368,7 @@ public class HubManager extends MiniClientPlugin @EventHandler public void InventoryCancel(InventoryClickEvent event) { - event.setCancelled(true); + //event.setCancelled(true); } @EventHandler