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

Fixed Bungee issue with ServerPing in MOTD.

Browse Source 
UPdated to latest spigot again.

Removed useless 1.7 stat tracking.

Fixed Party issue in hub
This commit is contained in:
Jonathan Williams 2014-04-26 02:47:04 -07:00
parent 07ca3a83ca
commit 7c9017f184
9 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Plugins/Libraries/BungeeCord.jar
View File

Binary file not shown.

BIN
Plugins/Libraries/craftbukkit.jar
View File

Binary file not shown.

BIN
Plugins/Libraries/craftbukkit_official.jar
View File

Binary file not shown.

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

@ -30,7 +30,7 @@ public class MotdManager implements Listener, Runnable
{
net.md_5.bungee.api.ServerPing serverPing = event.getResponse();
event.setResponse(new net.md_5.bungee.api.ServerPing(serverPing.getVersion(), serverPing.getPlayers(), _motd, serverPing.getFavicon()));
event.setResponse(new net.md_5.bungee.api.ServerPing(serverPing.getVersion(), serverPing.getPlayers(), _motd, serverPing.getFaviconObject()));
}
@Override

2
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerStats/PlayerStats.java
View File

@ -23,13 +23,11 @@ public class PlayerStats implements Listener
@EventHandler
public void playerConnect(final PostLoginEvent event)
{
System.out.println(event.getPlayer().getUniqueId());
_plugin.getProxy().getScheduler().runAsync(_plugin, new Runnable()
{
public void run()
{
_repository.addPlayer(event.getPlayer().getName());
_repository.addPlayerVersion(event.getPlayer().getName(), (event.getPlayer().getPendingConnection().getVersion() == 4 ? "1.7" : "1.6"));
}
});
}

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

@ -122,7 +122,7 @@ public class CoreClientManager implements Listener
@EventHandler(priority = EventPriority.LOWEST)
public void AsyncLogin(AsyncPlayerPreLoginEvent event)
{
{
try
{
LoadClient(Add(event.getName()), event.getUniqueId(), event.getAddress().getHostAddress());

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

@ -73,7 +73,7 @@ public class Hub extends JavaPlugin implements INautilusPlugin, IRelation
DonationManager donationManager = new DonationManager(this, GetWebServerAddress());
//Other Modules
//Other Modules
Creature creature = new Creature(this);
new MessageManager(this, clientManager);
@ -105,12 +105,13 @@ public class Hub extends JavaPlugin implements INautilusPlugin, IRelation
ItemFactory itemFactory = new ItemFactory(this, blockRestore, classManager, conditionManager, damage, energy, fire, throwManager, GetWebServerAddress());
ClassShopManager shopManager = new ClassShopManager(this, classManager, skillManager, itemFactory);
new ClassCombatShop(shopManager, clientManager, donationManager, "Brute", classManager.GetClass("Brute"));
new ClassCombatShop(shopManager, clientManager, donationManager, "Mage", classManager.GetClass("Mage"));
new ClassCombatShop(shopManager, clientManager, donationManager, "Ranger", classManager.GetClass("Ranger"));
new ClassCombatShop(shopManager, clientManager, donationManager, "Knight", classManager.GetClass("Knight"));
new ClassCombatShop(shopManager, clientManager, donationManager, "Assassin", classManager.GetClass("Assassin"));
//Updates
getServer().getScheduler().scheduleSyncRepeatingTask(this, new Updater(this), 1, 1);
}

6
Plugins/Mineplex.Hub/src/mineplex/hub/party/Party.java
View File

@ -245,7 +245,7 @@ public class Party
//Clear Past
for (String pastLine : _scoreboardLast)
_scoreboard.resetScores(Bukkit.getOfflinePlayer(pastLine));
_scoreboard.resetScores(pastLine);
_scoreboardLast.clear();
int i=16;
@ -265,7 +265,7 @@ public class Party
if (line.length() > 16)
line = line.substring(0, 16);
_scoreboardObj.getScore(Bukkit.getOfflinePlayer(line)).setScore(i);
_scoreboardObj.getScore(line).setScore(i);
_scoreboardLast.add(line);
@ -282,7 +282,7 @@ public class Party
if (line.length() > 16)
line = line.substring(0, 16);
_scoreboardObj.getScore(Bukkit.getOfflinePlayer(line)).setScore(i);
_scoreboardObj.getScore(line).setScore(i);
_scoreboardLast.add(line);

1
Plugins/Mineplex.Hub/src/mineplex/hub/party/PartyManager.java
View File

@ -88,7 +88,6 @@ public class PartyManager extends MiniPlugin
party.ExpireInvitees();
party.UpdateScoreboard();
}
}
public void ExpireParties()