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

Resolving issues from Portal.java conflict resolution

Browse Source
This commit is contained in:
Peter Miller 2014-07-02 04:09:41 -04:00
parent e7832fd06c
commit 6c67ff9106
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ public class Hub extends JavaPlugin implements IRelation
ItemStackFactory.Initialize(this, false); ItemStackFactory.Initialize(this, false);
Recharge.Initialize(this); Recharge.Initialize(this);
Punish punish = new Punish(this, webServerAddress, clientManager); Punish punish = new Punish(this, webServerAddress, clientManager);
Portal portal = new Portal(this, clientManager); Portal portal = new Portal(this);
AntiHack.Initialize(this, punish, portal); AntiHack.Initialize(this, punish, portal);
DonationManager donationManager = new DonationManager(this, webServerAddress); DonationManager donationManager = new DonationManager(this, webServerAddress);

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

@ -81,7 +81,7 @@ public class Arcade extends JavaPlugin
new MessageManager(this, _clientManager, preferenceManager); new MessageManager(this, _clientManager, preferenceManager);
AntiStack antistack = new AntiStack(this); AntiStack antistack = new AntiStack(this);
Portal portal = new Portal(this, _clientManager); Portal portal = new Portal(this);
Creature creature = new Creature(this); Creature creature = new Creature(this);
Spawn spawn = new Spawn(this); Spawn spawn = new Spawn(this);
Teleport teleport = new Teleport(this, _clientManager, spawn); Teleport teleport = new Teleport(this, _clientManager, spawn);