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

Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex

Browse Source
This commit is contained in:
Chiss 2013-11-17 09:54:06 +11:00
commit e91ed271c2
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java
View File

@ -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;

2
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java
View File

@ -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";

2
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCountRepository.java
View File

@ -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";

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

@ -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<HubClient>
{
_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<HubClient>
@EventHandler
public void InventoryCancel(InventoryClickEvent event)
{
event.setCancelled(true);
//event.setCancelled(true);
}
@EventHandler