From f51a6747fdc4121d8e400acaa51f373474492f43 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sun, 9 Mar 2014 00:50:13 -0800 Subject: [PATCH] Moved files into Mineplex.core Removed references to Core project. --- Plugins/Libraries/craftbukkit.jar | Bin 15228186 -> 15228186 bytes .../bungee/groupManager/GroupManager.java | 30 +++ .../bungee/groupManager/GroupRepository.java | 194 +++++++++++++++++ .../bungee/playerStats/PlayerStats.java | 28 +++ .../playerStats/PlayerStatsRepository.java | 104 +++++++++ .../src/mineplex/core/blood/Blood.java | 101 +++++++++ .../src/mineplex/core/memory}/MemoryFix.java | 2 +- Plugins/Mineplex.Hub/.classpath | 1 - .../Mineplex.Hub/src/mineplex/hub/Hub.java | 2 +- .../servermonitor/GenericRunnable.java | 6 + Plugins/Nautilus.Game.Arcade/.classpath | 1 - .../src/nautilus/game/arcade/Arcade.java | 198 +----------------- .../nautilus/game/arcade/ArcadeManager.java | 7 +- .../games/champions/kits/KitAssassin.java | 74 +++++++ .../game/games/champions/kits/KitBrute.java | 74 +++++++ .../game/games/champions/kits/KitMage.java | 74 +++++++ .../game/games/champions/kits/KitRanger.java | 74 +++++++ Plugins/Nautilus.Game.Core/.classpath | 1 - .../src/nautilus/game/core/GamePlugin.java | 27 +-- Plugins/Nautilus.Game.Dominate/.classpath | 1 - Plugins/Nautilus.Game.MineKart/.classpath | 1 - .../src/nautilus/game/minekart/MineKart.java | 5 +- 22 files changed, 779 insertions(+), 226 deletions(-) create mode 100644 Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/groupManager/GroupManager.java create mode 100644 Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/groupManager/GroupRepository.java create mode 100644 Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerStats/PlayerStats.java create mode 100644 Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerStats/PlayerStatsRepository.java create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/blood/Blood.java rename Plugins/{Core/src/me/chiss/Core/MemoryFix => Mineplex.Core/src/mineplex/core/memory}/MemoryFix.java (97%) create mode 100644 Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GenericRunnable.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar index da436cf1cb44c39f10e44fabb01ed7e3e3a6c578..89f5f6329c378850a32a59d72af6e31f4d465138 100644 GIT binary patch delta 1939 zcmYk+e_Tyx90%}IS6!}ZiW;#c$>c{rhgefdhJG_ElKj~8%j#CcIH=3G!bPl}sVgoa zY9>}snwHJlVwU#H2z3rqGux6EHeTEAKKFZgz4piZ_4=IieV*@g?sLz1O6pDO60nbr zQ1#LXLT^C`Rizc$k5q-I(y9aJd8%-Es>t(^UoV8IyG;o`Y^ZykWCZRU^I+@vEU6p;0u1>4*~EpjDzto0RmwnOoCS+2wsKB5DXy@3R55qrb0MO zgV$g>%z&8?0g(^|(GUZ%5C^khHoOjV;0>_sZ34`Nd5{S6Aqf^hGAx8euo#xWoA4HI zj$ay8VfoK$2Bx%ITY~n^?r*l-<=)mAEu$!z$7KBOOsRWHM(;^9=gFE3 z{$$OvoketIaC%#BaLVKcr!0pg8d;W=HE27f`hT)w>?ql3v{OSJEN{uz8<^ykM=d7TC zhQyrf4=F8+%N>1)Qpuy-1HqQ04<7#xEQb}a65i#(<5y|ysTvu!N*@`vnn#9-jr2iq zhct2F0P2ywR=j3KDJD-`WKEB<)P197h@Bur4Q7QaQ#^{xMK#-Rlr{XmPCV;ILyq39 zNw{Do2(c=ri(5UM4LvOO;}1;eMdjbj#~m)BJm>#q$8zz8vQ*C@(S`n8uBi~iG_-u| zNzqhFlamgXrl*DqLTVA~$x5>iVW2oUQzqUJueq}*xEiY*0RSC3NfnIfW<7l&* z{{7{cTYw;haER|m06)nTcG8*<`-Ss%-(cPGrycRSAHkFZEKKneM#5ms^7J~4X(j;xB=~a z*ZPj~tJG%Vd}$$Vj&Z)UiH-s0$)wqIOJq`#iqf?bsX%!NQ;ZTBVHr?@IAB;nH2nM|oGR{*c0zG~=E$jGC~_9_cI%^Sdv#D}9|FNXwPtmWR?@OObUx z4SdQYX^+yP{V!>qEzL|eOMXh)Z6gOL)$?k(E0L} zl*cGbZrdx-{z2z-8%j1$IurX+T4K|s(^2Z$)D>{~KljaBuK)l5 delta 1939 zcmYk+eOyg<90%~zt=r|Qme7ceB$KC}hMP4>W$2k%krYNxrdti;AeV848?pSRuDFD# zS!Ma9v24~Bv$Q88q-+8^)N{oLR8_i!G5=U38T(UgF5T%^5& zRuH-gLXdi4k@GNnoqA!7Znn4bd%W2DvA+Y_!*^N|ec2$-dhPn=1Y>i89jL$_96$|@ zpn-1C9kkE`oWL1e;5l%Gp5O+(pf~gZcX%H9LO<|;{xASufEQsP3<6IW3|=q%_<|q!LjVNA%Pp>%IjR=4pq=IN>|{&dyi z?Zx!Zcc}_lwI=V^4ab+y#(Qe53{RH z_hR=0^%}k@QlFx;N16Y!UcW1dI#!%=%(&?x2#0mHj@z5E9a(jk;D)=y&F69 z$EH%!`{lF@r4*Ww6FGs>w&I-lSeh%Z)j2c9PY}$REPnD5FIL?rSHt_>&dFUy9ZgBO z*B((?9G^GhAf=MWdHX|@WDFVmHY|l@upHjuA!Ao)ov9iXw!#<{wvtDMiH+Vg(j`Mo z?M*3XwRqKzQf$6BPeqrq$a8~sfRi9Z_h&`R)4X<-iyF4iENl4#gLq~jbvbgkF7dpb zAjH`-L;T7iY|tUml|Qs#E-L?OJ?3%&<(dC4_beB$+m`A&D7vd?QEi17rlk~DD_Tlv zaPooD%=Az}NH1nx*%`|6jx5?DYmEUht6(*(;Q=xE^8=KDMz%H|)`9`n!FqTXHo!(O z!X_wy&9DWwf(Z&?8*GOn*a17?Jt&4AV#$JyEw_hRWT3tCU`f>vIYNDoWrQ(r%Z9#+#oKOY?! zC@$ugxltlFQm~ZDRAbg>fhU{g zk+vnb?vYce)4l(~^s;9yb!GBdno`^=n{1cb!y*^@Ds4t{s|+{c7W@Raxw*At8XX|~ j&h?HKcN*L9uw#mvlKN>!QV&WC)SU(crOu6=ftUUTCLdTm diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/groupManager/GroupManager.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/groupManager/GroupManager.java new file mode 100644 index 000000000..190e0f7a2 --- /dev/null +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/groupManager/GroupManager.java @@ -0,0 +1,30 @@ +package mineplex.bungee.groupManager; + +import java.util.concurrent.TimeUnit; + +import mineplex.bungee.playerCount.PlayerCountRepository; +import net.md_5.bungee.api.plugin.Listener; +import net.md_5.bungee.api.plugin.Plugin; + +public class GroupManager implements Listener, Runnable +{ + private Plugin _plugin; + private GroupRepository _repository; + + public GroupManager(Plugin plugin) + { + _plugin = plugin; + + _plugin.getProxy().getScheduler().schedule(_plugin, this, 3L, 3L, TimeUnit.SECONDS); + _plugin.getProxy().getPluginManager().registerListener(_plugin, this); + + _repository = new GroupRepository(); + _repository.initialize(); + } + + @Override + public void run() + { + + } +} diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/groupManager/GroupRepository.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/groupManager/GroupRepository.java new file mode 100644 index 000000000..3b56665be --- /dev/null +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/groupManager/GroupRepository.java @@ -0,0 +1,194 @@ +package mineplex.bungee.groupManager; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +public class GroupRepository +{ + private Connection _connection = null; + private String _connectionString = "jdbc:mysql://db.mineplex.com:3306/BungeeServers?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; + private String _userName = "root"; + private String _password = "tAbechAk3wR7tuTh"; + + private static String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS Groups (id INT NOT NULL AUTO_INCREMENT, address VARCHAR(256), updated LONG, players INT, maxPlayers INT, ram INT, maxRam INT, PRIMARY KEY (id));"; + private static String INSERT_PLAYER_COUNT = "INSERT INTO BungeeServers(address, updated, players, maxPlayers, ram, maxRam) values(?, now(), ?, ?, ?, ?);"; + private static String UPDATE_PLAYER_COUNT = "UPDATE BungeeServers SET updated = now(), players = ?, maxPlayers = ?, ram = ?, maxRam = ? WHERE id = ?;"; + private static String RETRIEVE_ID = "SELECT id FROM BungeeServers WHERE address = ?;"; + private static String RETRIEVE_PLAYER_COUNT = "SELECT SUM(players) AS playerCount, SUM(maxPlayers) AS maxPlayerCount FROM BungeeServers WHERE TIME_TO_SEC(TIMEDIFF(now(), BungeeServers.updated)) < 10;"; + + private int _id = -1; + private String _address; + private int _maxPlayers = 0; + + public void initialize() + { + ResultSet resultSet = null; + PreparedStatement preparedStatement = null; + PreparedStatement preparedStatementRetrieve = null; + PreparedStatement preparedStatementInsert = null; + + try + { + if (_connection == null || _connection.isClosed()) + _connection = DriverManager.getConnection(_connectionString, _userName, _password); + + // Create table + preparedStatement = _connection.prepareStatement(CREATE_TABLE); + preparedStatement.execute(); + + + // Retrieve id + preparedStatementRetrieve = _connection.prepareStatement(RETRIEVE_ID); + preparedStatementRetrieve.setString(1, _address); + resultSet = preparedStatementRetrieve.executeQuery(); + + while (resultSet.next()) + { + _id = resultSet.getInt("id"); + } + + // Insert if not there + if (_id == -1) + { + preparedStatementInsert = _connection.prepareStatement(INSERT_PLAYER_COUNT, Statement.RETURN_GENERATED_KEYS); + + preparedStatementInsert.setString(1, _address); + preparedStatementInsert.setInt(2, 0); + preparedStatementInsert.setInt(3, _maxPlayers); + preparedStatementInsert.setInt(4, (int) ((Runtime.getRuntime().maxMemory() - Runtime.getRuntime().freeMemory()) / 1048576)); + preparedStatementInsert.setInt(5, (int) (Runtime.getRuntime().maxMemory() / 1048576)); + + int affectedRows = preparedStatementInsert.executeUpdate(); + + if (affectedRows == 0) + { + throw new SQLException("Creating bungee server failed, no rows affected."); + } + + resultSet.close(); + resultSet = preparedStatementInsert.getGeneratedKeys(); + + if (resultSet.next()) + { + _id = resultSet.getInt(1); + System.out.println("id = " + _id); + } + } + } + catch (Exception exception) + { + exception.printStackTrace(); + } + finally + { + if (preparedStatement != null) + { + try + { + preparedStatement.close(); + } + catch (SQLException e) + { + e.printStackTrace(); + } + } + + if (preparedStatementRetrieve != null) + { + try + { + preparedStatementRetrieve.close(); + } + catch (SQLException e) + { + e.printStackTrace(); + } + } + + if (preparedStatementInsert != null) + { + try + { + preparedStatementInsert.close(); + } + catch (SQLException e) + { + e.printStackTrace(); + } + } + + if (resultSet != null) + { + try + { + resultSet.close(); + } + catch (SQLException e) + { + e.printStackTrace(); + } + } + } + } + + public boolean updatePlayerCountInDatabase(int players) + { + PreparedStatement preparedStatement = null; + + try + { + if (_connection == null || _connection.isClosed()) + _connection = DriverManager.getConnection(_connectionString, _userName, _password); + + preparedStatement = _connection.prepareStatement(UPDATE_PLAYER_COUNT, Statement.RETURN_GENERATED_KEYS); + + preparedStatement.setInt(1, players); + preparedStatement.setInt(2, _maxPlayers); + preparedStatement.setInt(3, (int) ((Runtime.getRuntime().maxMemory() - Runtime.getRuntime().freeMemory()) / 1048576)); + preparedStatement.setInt(4, (int) (Runtime.getRuntime().maxMemory() / 1048576)); + preparedStatement.setInt(5, _id); + + int affectedRows = preparedStatement.executeUpdate(); + + if (affectedRows == 0) + { + throw new SQLException("Updating bungee server player count failed, no rows affected."); + } + + return true; + } + catch (Exception exception) + { + exception.printStackTrace(); + + try + { + Thread.sleep(10); + } + catch (InterruptedException e) + { + e.printStackTrace(); + } + + return updatePlayerCountInDatabase(players); + } + finally + { + if (preparedStatement != null) + { + try + { + preparedStatement.close(); + } + catch (SQLException e) + { + e.printStackTrace(); + } + } + } + } +} diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerStats/PlayerStats.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerStats/PlayerStats.java new file mode 100644 index 000000000..6f1a154b9 --- /dev/null +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerStats/PlayerStats.java @@ -0,0 +1,28 @@ +package mineplex.bungee.playerStats; + +import net.md_5.bungee.api.event.PostLoginEvent; +import net.md_5.bungee.api.plugin.Listener; +import net.md_5.bungee.api.plugin.Plugin; +import net.md_5.bungee.event.EventHandler; + +public class PlayerStats implements Listener +{ + private Plugin _plugin; + private PlayerStatsRepository _repository; + + public PlayerStats(Plugin plugin) + { + _plugin = plugin; + + _plugin.getProxy().getPluginManager().registerListener(_plugin, this); + + _repository = new PlayerStatsRepository(); + _repository.initialize(); + } + + @EventHandler + public void playerConnect(PostLoginEvent event) + { + _repository.addPlayer(event.getPlayer().getName()); + } +} diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerStats/PlayerStatsRepository.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerStats/PlayerStatsRepository.java new file mode 100644 index 000000000..5711fb8cb --- /dev/null +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerStats/PlayerStatsRepository.java @@ -0,0 +1,104 @@ +package mineplex.bungee.playerStats; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; + +public class PlayerStatsRepository +{ + private Connection _connection = null; + private String _connectionString = "jdbc:mysql://sqlstats.mineplex.com:3306/PlayerStats?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; + private String _userName = "root"; + private String _password = "tAbechAk3wR7tuTh"; + + private static String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS DailyUnique (id INT NOT NULL AUTO_INCREMENT, day VARCHAR(100), playerName VARCHAR(20), PRIMARY KEY (id), UNIQUE KEY unique_player_per_day (day, playerName));"; + private static String INSERT_PLAYER = "INSERT INTO DailyUnique (day, playerName) values(curdate(), ?) ON DUPLICATE KEY UPDATE playerName=playerName;"; + + public void initialize() + { + PreparedStatement preparedStatement = null; + + try + { + if (_connection == null || _connection.isClosed()) + _connection = DriverManager.getConnection(_connectionString, _userName, _password); + + // Create table + preparedStatement = _connection.prepareStatement(CREATE_TABLE); + preparedStatement.execute(); + } + catch (Exception exception) + { + exception.printStackTrace(); + } + finally + { + if (preparedStatement != null) + { + try + { + preparedStatement.close(); + } + catch (SQLException e) + { + e.printStackTrace(); + } + } + } + } + + public boolean addPlayer(String playerName) + { + PreparedStatement preparedStatement = null; + + try + { + if (_connection == null || _connection.isClosed()) + _connection = DriverManager.getConnection(_connectionString, _userName, _password); + + preparedStatement = _connection.prepareStatement(INSERT_PLAYER, Statement.RETURN_GENERATED_KEYS); + + preparedStatement.setString(1, playerName); + + int affectedRows = preparedStatement.executeUpdate(); + + if (affectedRows == 0) + { + throw new SQLException("Adding unique player record failed, no rows affected."); + } + + return true; + } + catch (Exception exception) + { + exception.printStackTrace(); + + try + { + Thread.sleep(10); + } + catch (InterruptedException e) + { + e.printStackTrace(); + } + + return addPlayer(playerName); + } + finally + { + if (preparedStatement != null) + { + try + { + preparedStatement.close(); + } + catch (SQLException e) + { + e.printStackTrace(); + } + } + } + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/blood/Blood.java b/Plugins/Mineplex.Core/src/mineplex/core/blood/Blood.java new file mode 100644 index 000000000..517afb12e --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/blood/Blood.java @@ -0,0 +1,101 @@ +package mineplex.core.blood; + +import java.util.HashMap; +import java.util.HashSet; + +import mineplex.core.MiniPlugin; +import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.updater.event.UpdateEvent; +import mineplex.core.updater.UpdateType; + +import org.bukkit.Effect; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.entity.Item; +import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.inventory.InventoryPickupItemEvent; +import org.bukkit.event.player.PlayerPickupItemEvent; +import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.util.Vector; + +public class Blood extends MiniPlugin +{ + private HashMap _blood = new HashMap(); + + public Blood(JavaPlugin plugin) + { + super("Blood", plugin); + } + + @EventHandler + public void Death(PlayerDeathEvent event) + { + Effects(event.getEntity().getEyeLocation(), 10, 0.5, Sound.HURT, 1f, 1f, Material.INK_SACK, (byte)1, true); + } + + public void Effects(Location loc, int particles, double velMult, Sound sound, + float soundVol, float soundPitch, Material type, byte data, boolean bloodStep) + { + Effects(loc, particles, velMult, sound, soundVol, soundPitch, type, data, 10, bloodStep); + } + + public void Effects(Location loc, int particles, double velMult, Sound sound, + float soundVol, float soundPitch, Material type, byte data, int ticks, boolean bloodStep) + { + for (int i = 0 ; i < particles ; i++) + { + Item item = loc.getWorld().dropItem(loc, + ItemStackFactory.Instance.CreateStack(type, data)); + + item.setVelocity(new Vector((Math.random() - 0.5)*velMult,Math.random()*velMult,(Math.random() - 0.5)*velMult)); + + _blood.put(item, ticks); + } + + if (bloodStep) + loc.getWorld().playEffect(loc, Effect.STEP_SOUND, 55); + + loc.getWorld().playSound(loc, sound, soundVol, soundPitch); + } + + @EventHandler + public void Update(UpdateEvent event) + { + if (event.getType() != UpdateType.FAST) + return; + + HashSet expire = new HashSet(); + + for (Item cur : _blood.keySet()) + if (cur.getTicksLived() > _blood.get(cur) || !cur.isValid()) + expire.add(cur); + + for (Item cur : expire) + { + cur.remove(); + _blood.remove(cur); + } + } + + @EventHandler + public void Pickup(PlayerPickupItemEvent event) + { + if (event.isCancelled()) + return; + + if (_blood.containsKey(event.getItem())) + event.setCancelled(true); + } + + @EventHandler + public void HopperPickup(InventoryPickupItemEvent event) + { + if (event.isCancelled()) + return; + + if (_blood.containsKey(event.getItem())) + event.setCancelled(true); + } +} diff --git a/Plugins/Core/src/me/chiss/Core/MemoryFix/MemoryFix.java b/Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java similarity index 97% rename from Plugins/Core/src/me/chiss/Core/MemoryFix/MemoryFix.java rename to Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java index 8ace78a39..f9f2b80ff 100644 --- a/Plugins/Core/src/me/chiss/Core/MemoryFix/MemoryFix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java @@ -1,4 +1,4 @@ -package me.chiss.Core.MemoryFix; +package mineplex.core.memory; import java.util.Iterator; diff --git a/Plugins/Mineplex.Hub/.classpath b/Plugins/Mineplex.Hub/.classpath index 4f837287b..a2e0729de 100644 --- a/Plugins/Mineplex.Hub/.classpath +++ b/Plugins/Mineplex.Hub/.classpath @@ -9,7 +9,6 @@ - diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index 7e71e8cb9..ee541a839 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -1,6 +1,5 @@ package mineplex.hub; -import me.chiss.Core.MemoryFix.MemoryFix; import mineplex.core.account.CoreClientManager; import mineplex.core.antihack.AntiHack; import mineplex.core.blockrestore.BlockRestore; @@ -11,6 +10,7 @@ import mineplex.core.disguise.DisguiseManager; import mineplex.core.donation.DonationManager; import mineplex.core.energy.Energy; import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.memory.MemoryFix; import mineplex.core.message.MessageManager; import mineplex.core.monitor.LagMeter; import mineplex.core.movement.Movement; diff --git a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GenericRunnable.java b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GenericRunnable.java new file mode 100644 index 000000000..2541be020 --- /dev/null +++ b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GenericRunnable.java @@ -0,0 +1,6 @@ +package mineplex.servermonitor; + +public interface GenericRunnable +{ + void run(T t); +} diff --git a/Plugins/Nautilus.Game.Arcade/.classpath b/Plugins/Nautilus.Game.Arcade/.classpath index a2e20f820..dd58e6a1c 100644 --- a/Plugins/Nautilus.Game.Arcade/.classpath +++ b/Plugins/Nautilus.Game.Arcade/.classpath @@ -5,7 +5,6 @@ - diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index 1360bc04f..4a95c7eac 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -8,11 +8,11 @@ import java.io.FileInputStream; import java.io.FileWriter; import java.io.InputStreamReader; -import me.chiss.Core.Config.Config; import mineplex.core.account.CoreClientManager; import mineplex.core.antihack.AntiHack; import mineplex.core.antistack.AntiStack; import mineplex.core.blockrestore.BlockRestore; +import mineplex.core.blood.Blood; import mineplex.core.command.CommandCenter; import mineplex.core.common.util.FileUtil; import mineplex.core.common.util.UtilServer; @@ -21,12 +21,7 @@ import mineplex.core.disguise.DisguiseManager; import mineplex.core.donation.DonationManager; import mineplex.core.energy.Energy; import mineplex.core.itemstack.ItemStackFactory; -import me.chiss.Core.Loot.LootFactory; -import me.chiss.Core.MemoryFix.MemoryFix; -import me.chiss.Core.Module.ModuleManager; -import me.chiss.Core.Modules.*; -import me.chiss.Core.Plugin.IPlugin; -import me.chiss.Core.Scheduler.Scheduler; +import mineplex.core.memory.MemoryFix; import mineplex.core.message.MessageManager; import mineplex.core.monitor.LagMeter; import mineplex.core.npc.NpcManager; @@ -45,7 +40,6 @@ import mineplex.minecraft.game.core.combat.CombatManager; import mineplex.minecraft.game.core.condition.ConditionManager; import mineplex.minecraft.game.core.damage.DamageManager; import mineplex.minecraft.game.core.fire.Fire; - import nautilus.game.arcade.game.GameServerConfig; import nautilus.minecraft.core.INautilusPlugin; @@ -55,28 +49,20 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -public class Arcade extends JavaPlugin implements INautilusPlugin, IPlugin +public class Arcade extends JavaPlugin implements INautilusPlugin { private String WEB_CONFIG = "webServer"; //Modules - private ModuleManager _moduleManager; - private Config _config; private CoreClientManager _clientManager; private DonationManager _donationManager; private DamageManager _damageManager; - private Utility _utility; - private BlockRegenerate _blockRegenerate; private BlockRestore _blockRestore; private Blood _blood; private ConditionManager _condition; private Creature _creature; private Fire _fire; - private Logger _logger; - private LootFactory _lootFactory; - private Observer _observer; private PetManager _petManager; - private me.chiss.Core.Server.Server _serverModule; private Spawn _spawn; private Teleport _teleport; private ProjectileManager _throw; @@ -94,9 +80,6 @@ public class Arcade extends JavaPlugin implements INautilusPlugin, IPlugin getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG)); saveConfig(); - //Init Modules - GetModules(); - _clientManager = CoreClientManager.Initialize(this, GetWebServerAddress()); CommandCenter.Initialize(this, _clientManager); @@ -112,24 +95,21 @@ public class Arcade extends JavaPlugin implements INautilusPlugin, IPlugin AntiStack antistack = new AntiStack(this); - GetCreature(); - GetSpawn(); - GetTeleport(); + Creature creature = new Creature(this); + Spawn spawn = new Spawn(this); + Teleport teleport = new Teleport(this, _clientManager, spawn); new FileUpdater(this, new Portal(this)); new ServerStatusManager(this, new LagMeter(this, _clientManager)); PacketHandler packetHandler = new PacketHandler(this); DisguiseManager disguiseManager = new DisguiseManager(this, packetHandler); - _damageManager = new DamageManager(this, new CombatManager(this), new NpcManager(this, GetCreature()), disguiseManager); + _damageManager = new DamageManager(this, new CombatManager(this), new NpcManager(this, creature), disguiseManager); Portal portal = new Portal(this); //Arcade Manager - _gameManager = new ArcadeManager(this, ReadServerConfig(), _clientManager, _donationManager, conditionManager, _damageManager, disguiseManager, GetCreature(), GetBlood(), antistack, portal, packetHandler, GetWebServerAddress()); - - //Unreferenced Modules - Scheduler.Initialize(this); + _gameManager = new ArcadeManager(this, ReadServerConfig(), _clientManager, _donationManager, conditionManager, _damageManager, disguiseManager, creature, teleport, new Blood(this), antistack, portal, packetHandler, GetWebServerAddress()); Punish punish = new Punish(this, GetWebServerAddress(), _clientManager); AntiHack.Initialize(this, punish, portal); @@ -144,8 +124,6 @@ public class Arcade extends JavaPlugin implements INautilusPlugin, IPlugin @Override public void onDisable() { - GetModules().onDisable(); - for (Player player : UtilServer.getPlayers()) player.kickPlayer("Server Shutdown"); @@ -306,164 +284,4 @@ public class Arcade extends JavaPlugin implements INautilusPlugin, IPlugin { return GetRealServer().getPluginManager(); } - - @Override - public void Log(String moduleName, String data) - { - System.out.println(moduleName + " : " + data); - } - - @Override - public ModuleManager GetModules() - { - if (_moduleManager == null) - _moduleManager = new ModuleManager(); - - return _moduleManager; - } - - @Override - public Config GetConfig() - { - if (_config == null) - _config = new Config(this); - - return _config; - } - - @Override - public Utility GetUtility() - { - if (_utility == null) - _utility = new Utility(this); - - return _utility; - } - - @Override - public BlockRegenerate GetBlockRegenerate() - { - if (_blockRegenerate == null) - _blockRegenerate = new BlockRegenerate(this); - - return _blockRegenerate; - } - - @Override - public BlockRestore GetBlockRestore() - { - if (_blockRestore == null) - _blockRestore = new BlockRestore(this); - - return _blockRestore; - } - - @Override - public Blood GetBlood() - { - if (_blood == null) - _blood = new Blood(this); - - return _blood; - } - - @Override - public Creature GetCreature() - { - if (_creature == null) - _creature = new Creature(this); - - return _creature; - } - - - @Override - public Fire GetFire() - { - if (_fire == null) - _fire = new Fire(this, _condition, _damageManager); - - return _fire; - } - - @Override - public Logger GetLogger() - { - if (_logger == null) - _logger = new Logger(this); - - return _logger; - } - - @Override - public LootFactory GetLoot() - { - if (_lootFactory == null) - _lootFactory = new LootFactory(this); - - return _lootFactory; - } - - @Override - public Observer GetObserver() - { - if (_observer == null) - _observer = new Observer(this); - - return _observer; - } - - @Override - public me.chiss.Core.Server.Server GetServer() - { - if (_serverModule == null) - _serverModule = new me.chiss.Core.Server.Server(this, _clientManager); - - return _serverModule; - } - - @Override - public Spawn GetSpawn() - { - if (_spawn == null) - _spawn = new Spawn(this); - - return _spawn; - } - - @Override - public Teleport GetTeleport() - { - if (_teleport == null) - _teleport = new Teleport(this, _clientManager, GetSpawn()); - - return _teleport; - } - - @Override - public ProjectileManager GetThrow() - { - if (_throw == null) - _throw = new ProjectileManager(this); - - return _throw; - } - - @Override - public Location GetSpawnLocation() - { - return null; - } - - @Override - public PetManager GetPetManager() - { - return _petManager; - } - - @Override - public Energy GetEnergy() - { - return null; - } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index c4b8711da..0cf8422ec 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -45,10 +45,10 @@ import mineplex.minecraft.game.core.damage.DamageManager; import mineplex.minecraft.game.core.fire.Fire; import mineplex.core.MiniPlugin; import mineplex.core.itemstack.ItemStackFactory; -import me.chiss.Core.Modules.Blood; import mineplex.core.account.CoreClientManager; import mineplex.core.antistack.AntiStack; import mineplex.core.blockrestore.BlockRestore; +import mineplex.core.blood.Blood; import mineplex.core.chat.Chat; import mineplex.core.common.Rank; import mineplex.core.common.util.*; @@ -62,6 +62,7 @@ import mineplex.core.explosion.Explosion; import mineplex.core.portal.Portal; import mineplex.core.projectile.ProjectileManager; import mineplex.core.stats.StatsManager; +import mineplex.core.teleport.Teleport; public class ArcadeManager extends MiniPlugin implements IRelation { @@ -105,7 +106,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation //Games private Game _game; - public ArcadeManager(Arcade plugin, GameServerConfig serverConfig, CoreClientManager clientManager, DonationManager donationManager, ConditionManager conditionManager, DamageManager damageManager, DisguiseManager disguiseManager, Creature creature, Blood blood, AntiStack antistack, Portal portal, PacketHandler packetHandler, String webAddress) + public ArcadeManager(Arcade plugin, GameServerConfig serverConfig, CoreClientManager clientManager, DonationManager donationManager, ConditionManager conditionManager, DamageManager damageManager, DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, AntiStack antistack, Portal portal, PacketHandler packetHandler, String webAddress) { super("Game Manager", plugin); @@ -143,7 +144,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation if (serverConfig.GameList.contains(GameType.Champions)) { - _skillFactory = new SkillFactory(plugin, damageManager, this, new CombatManager(plugin), conditionManager, _projectileManager, _blockRestore, _fire, new Movement(plugin), plugin.GetTeleport(), new Energy(plugin), webAddress); + _skillFactory = new SkillFactory(plugin, damageManager, this, new CombatManager(plugin), conditionManager, _projectileManager, _blockRestore, _fire, new Movement(plugin), teleport, new Energy(plugin), webAddress); _classManager = new ClassManager(plugin, clientManager, donationManager, _skillFactory, webAddress); _classShopManager = new ClassShopManager(_plugin, _classManager, _skillFactory, new ItemPackFactory(_plugin)); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java new file mode 100644 index 000000000..85db6c7af --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java @@ -0,0 +1,74 @@ +package nautilus.game.arcade.game.games.champions.kits; + +import java.util.HashMap; + +import org.bukkit.Material; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import mineplex.minecraft.game.classcombat.Class.ClientClass; +import mineplex.minecraft.game.classcombat.Class.IPvpClass; +import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.kit.Kit; +import nautilus.game.arcade.kit.KitAvailability; +import nautilus.game.arcade.kit.Perk; + +public class KitAssassin extends Kit +{ + private HashMap _class = new HashMap(); + + public KitAssassin(ArcadeManager manager) + { + super(manager, "Assassin", KitAvailability.Free, + new String[] + { + + }, + new Perk[] + { + + }, + EntityType.ZOMBIE, + new ItemStack(Material.IRON_SWORD)); + + } + + @Override + public void Deselected(Player player) + { + _class.remove(player); + } + + @Override + public void Selected(Player player) + { + _class.put(player, Manager.getClassManager().Get(player)); + ClientClass clientClass = _class.get(player); + IPvpClass pvpClass = Manager.getClassManager().GetClass("Assassin"); + + player.getInventory().clear(); + + clientClass.SetGameClass(pvpClass); + pvpClass.ApplyArmor(player); + clientClass.ClearDefaults(); + + Manager.openClassShop(player, Manager.getClassManager().GetClass("Assassin")); + } + + @Override + public void GiveItems(Player player) + { + _class.get(player).ResetToDefaults(true, true); + } + + @Override + public void SpawnCustom(LivingEntity ent) + { + ent.getEquipment().setHelmet(new ItemStack(Material.LEATHER_HELMET)); + ent.getEquipment().setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE)); + ent.getEquipment().setLeggings(new ItemStack(Material.LEATHER_LEGGINGS)); + ent.getEquipment().setBoots(new ItemStack(Material.LEATHER_BOOTS)); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java new file mode 100644 index 000000000..d36737bee --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java @@ -0,0 +1,74 @@ +package nautilus.game.arcade.game.games.champions.kits; + +import java.util.HashMap; + +import org.bukkit.Material; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import mineplex.minecraft.game.classcombat.Class.ClientClass; +import mineplex.minecraft.game.classcombat.Class.IPvpClass; +import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.kit.Kit; +import nautilus.game.arcade.kit.KitAvailability; +import nautilus.game.arcade.kit.Perk; + +public class KitBrute extends Kit +{ + private HashMap _class = new HashMap(); + + public KitBrute(ArcadeManager manager) + { + super(manager, "Brute", KitAvailability.Free, + new String[] + { + + }, + new Perk[] + { + + }, + EntityType.ZOMBIE, + new ItemStack(Material.IRON_SWORD)); + + } + + @Override + public void Deselected(Player player) + { + _class.remove(player); + } + + @Override + public void Selected(Player player) + { + _class.put(player, Manager.getClassManager().Get(player)); + ClientClass clientClass = _class.get(player); + IPvpClass pvpClass = Manager.getClassManager().GetClass("Brute"); + + player.getInventory().clear(); + + clientClass.SetGameClass(pvpClass); + pvpClass.ApplyArmor(player); + clientClass.ClearDefaults(); + + Manager.openClassShop(player, Manager.getClassManager().GetClass("Brute")); + } + + @Override + public void GiveItems(Player player) + { + _class.get(player).ResetToDefaults(true, true); + } + + @Override + public void SpawnCustom(LivingEntity ent) + { + ent.getEquipment().setHelmet(new ItemStack(Material.DIAMOND_HELMET)); + ent.getEquipment().setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE)); + ent.getEquipment().setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS)); + ent.getEquipment().setBoots(new ItemStack(Material.DIAMOND_BOOTS)); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java new file mode 100644 index 000000000..d0fc70c85 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java @@ -0,0 +1,74 @@ +package nautilus.game.arcade.game.games.champions.kits; + +import java.util.HashMap; + +import org.bukkit.Material; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import mineplex.minecraft.game.classcombat.Class.ClientClass; +import mineplex.minecraft.game.classcombat.Class.IPvpClass; +import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.kit.Kit; +import nautilus.game.arcade.kit.KitAvailability; +import nautilus.game.arcade.kit.Perk; + +public class KitMage extends Kit +{ + private HashMap _class = new HashMap(); + + public KitMage(ArcadeManager manager) + { + super(manager, "Mage", KitAvailability.Free, + new String[] + { + + }, + new Perk[] + { + + }, + EntityType.ZOMBIE, + new ItemStack(Material.IRON_SWORD)); + + } + + @Override + public void Deselected(Player player) + { + _class.remove(player); + } + + @Override + public void Selected(Player player) + { + _class.put(player, Manager.getClassManager().Get(player)); + ClientClass clientClass = _class.get(player); + IPvpClass pvpClass = Manager.getClassManager().GetClass("Mage"); + + player.getInventory().clear(); + + clientClass.SetGameClass(pvpClass); + pvpClass.ApplyArmor(player); + clientClass.ClearDefaults(); + + Manager.openClassShop(player, Manager.getClassManager().GetClass("Mage")); + } + + @Override + public void GiveItems(Player player) + { + _class.get(player).ResetToDefaults(true, true); + } + + @Override + public void SpawnCustom(LivingEntity ent) + { + ent.getEquipment().setHelmet(new ItemStack(Material.GOLD_HELMET)); + ent.getEquipment().setChestplate(new ItemStack(Material.GOLD_CHESTPLATE)); + ent.getEquipment().setLeggings(new ItemStack(Material.GOLD_LEGGINGS)); + ent.getEquipment().setBoots(new ItemStack(Material.GOLD_BOOTS)); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java new file mode 100644 index 000000000..6f62967f8 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java @@ -0,0 +1,74 @@ +package nautilus.game.arcade.game.games.champions.kits; + +import java.util.HashMap; + +import org.bukkit.Material; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import mineplex.minecraft.game.classcombat.Class.ClientClass; +import mineplex.minecraft.game.classcombat.Class.IPvpClass; +import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.kit.Kit; +import nautilus.game.arcade.kit.KitAvailability; +import nautilus.game.arcade.kit.Perk; + +public class KitRanger extends Kit +{ + private HashMap _class = new HashMap(); + + public KitRanger(ArcadeManager manager) + { + super(manager, "Ranger", KitAvailability.Free, + new String[] + { + + }, + new Perk[] + { + + }, + EntityType.ZOMBIE, + new ItemStack(Material.IRON_SWORD)); + + } + + @Override + public void Deselected(Player player) + { + _class.remove(player); + } + + @Override + public void Selected(Player player) + { + _class.put(player, Manager.getClassManager().Get(player)); + ClientClass clientClass = _class.get(player); + IPvpClass pvpClass = Manager.getClassManager().GetClass("Ranger"); + + player.getInventory().clear(); + + clientClass.SetGameClass(pvpClass); + pvpClass.ApplyArmor(player); + clientClass.ClearDefaults(); + + Manager.openClassShop(player, Manager.getClassManager().GetClass("Ranger")); + } + + @Override + public void GiveItems(Player player) + { + _class.get(player).ResetToDefaults(true, true); + } + + @Override + public void SpawnCustom(LivingEntity ent) + { + ent.getEquipment().setHelmet(new ItemStack(Material.CHAINMAIL_HELMET)); + ent.getEquipment().setChestplate(new ItemStack(Material.CHAINMAIL_CHESTPLATE)); + ent.getEquipment().setLeggings(new ItemStack(Material.CHAINMAIL_LEGGINGS)); + ent.getEquipment().setBoots(new ItemStack(Material.CHAINMAIL_BOOTS)); + } +} diff --git a/Plugins/Nautilus.Game.Core/.classpath b/Plugins/Nautilus.Game.Core/.classpath index 047fe522b..1f505e73a 100644 --- a/Plugins/Nautilus.Game.Core/.classpath +++ b/Plugins/Nautilus.Game.Core/.classpath @@ -9,6 +9,5 @@ - diff --git a/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java b/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java index ca976bce0..91a41b6ff 100644 --- a/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java +++ b/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java @@ -5,6 +5,7 @@ import java.util.HashSet; import mineplex.core.account.CoreClientManager; import mineplex.core.antistack.AntiStack; import mineplex.core.blockrestore.BlockRestore; +import mineplex.core.blood.Blood; import mineplex.core.command.CommandCenter; import mineplex.core.creature.Creature; import mineplex.core.disguise.DisguiseManager; @@ -12,9 +13,8 @@ import mineplex.core.donation.DonationManager; import mineplex.core.energy.Energy; import mineplex.core.fakeEntity.FakeEntityManager; import mineplex.core.itemstack.ItemStackFactory; -import me.chiss.Core.MemoryFix.MemoryFix; -import me.chiss.Core.Module.ModuleManager; -import me.chiss.Core.Modules.*; +import mineplex.core.join.JoinQuit; +import mineplex.core.memory.MemoryFix; import mineplex.core.message.MessageManager; import mineplex.core.monitor.LagMeter; import mineplex.core.movement.Movement; @@ -69,14 +69,12 @@ public abstract class GamePlugin extends JavaPlugin implements IRelation protected PacketHandler PacketHandler; protected Energy Energy; private Fire _fire; - private ModuleManager _moduleManager; protected NpcManager NpcManager; protected SkillFactory SkillManager; private Spawn _spawn; private Teleport _teleport; private ProjectileManager _throw; - private ServerListener _serverListener; private Location _spawnLocation; protected ServerTalker HubConnection; @@ -98,9 +96,7 @@ public abstract class GamePlugin extends JavaPlugin implements IRelation FakeEntityManager.Initialize(this); ItemStackFactory.Initialize(this, true); Recharge.Initialize(this); - - _moduleManager = new ModuleManager(); - + Updater updater = new Updater(this); _creature = new Creature(this); Energy = new Energy(this); @@ -136,14 +132,6 @@ public abstract class GamePlugin extends JavaPlugin implements IRelation getServer().getScheduler().scheduleSyncRepeatingTask(this, updater, 1, 1); - // _serverListener = new ServerListener(GetWebServerAddress(), getServer().getIp(), getServer().getPort() + 1); - // _serverListener.start(); - - //HubConnection = new ServerTalker(getConfig().getString(HUB_SERVER)); - // HubConnection.start(); - - //HubConnection.QueuePacket(new ServerReadyPacket(getServer().getIp() + ":" + getServer().getPort())); - ClassShopManager shopManager = new ClassShopManager(this, ClassManager, SkillManager, null); new ClassCombatShop(shopManager, ClientManager, DonationManager, "Select Class Here"); new ClassCombatPurchaseShop(shopManager, ClientManager, DonationManager, "Skill Shop"); @@ -164,13 +152,6 @@ public abstract class GamePlugin extends JavaPlugin implements IRelation } protected abstract String GetServerName(); - - @Override - public void onDisable() - { - _moduleManager.onDisable(); - _serverListener.Shutdown(); - } public String GetWebServerAddress() { diff --git a/Plugins/Nautilus.Game.Dominate/.classpath b/Plugins/Nautilus.Game.Dominate/.classpath index 462e8dcff..e6824d3ce 100644 --- a/Plugins/Nautilus.Game.Dominate/.classpath +++ b/Plugins/Nautilus.Game.Dominate/.classpath @@ -4,7 +4,6 @@ - diff --git a/Plugins/Nautilus.Game.MineKart/.classpath b/Plugins/Nautilus.Game.MineKart/.classpath index fdb3b8d0a..652a7606a 100644 --- a/Plugins/Nautilus.Game.MineKart/.classpath +++ b/Plugins/Nautilus.Game.MineKart/.classpath @@ -8,6 +8,5 @@ - diff --git a/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java b/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java index cceb9620f..75bf40ab0 100644 --- a/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java +++ b/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java @@ -4,8 +4,6 @@ import java.io.File; import java.io.FileFilter; import java.io.IOException; -import me.chiss.Core.MemoryFix.MemoryFix; -import me.chiss.Core.Modules.*; import mineplex.core.account.CoreClientManager; import mineplex.core.antistack.AntiStack; import mineplex.core.blockrestore.BlockRestore; @@ -17,6 +15,8 @@ import mineplex.core.explosion.Explosion; import mineplex.core.fakeEntity.FakeEntity; import mineplex.core.fakeEntity.FakeEntityManager; import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.join.JoinQuit; +import mineplex.core.memory.MemoryFix; import mineplex.core.monitor.LagMeter; import mineplex.core.npc.NpcManager; import mineplex.core.packethandler.PacketHandler; @@ -27,7 +27,6 @@ import mineplex.core.spawn.Spawn; import mineplex.core.status.ServerStatusManager; import mineplex.core.teleport.Teleport; import mineplex.core.updater.Updater; - import nautilus.game.minekart.gp.GPManager; import nautilus.game.minekart.kart.KartManager; import nautilus.game.minekart.menu.KartMenu;