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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
CoderTim 2014-07-07 19:10:40 -04:00
parent 38e4240a61 ddf1a8ff74
commit 3490db4b6f
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/SendCommand.java
View File

@ -1,6 +1,5 @@
package mineplex.core.portal.Commands;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import mineplex.core.command.*;
@ -37,7 +36,7 @@ public class SendCommand extends CommandBase<Portal>
{
if (!playerExists)
{
UtilPlayer.message(player, F.main(Plugin.GetName(), C.cGray + "Player " + C.cGold + serverTarget + C.cGray + " does not exist!"));
UtilPlayer.message(player, F.main(Plugin.GetName(), C.cGray + "Player " + C.cGold + playerTarget + C.cGray + " does not exist!"));
return;
}
@ -51,13 +50,7 @@ public class SendCommand extends CommandBase<Portal>
return;
}
Bukkit.getServer().getScheduler().runTaskAsynchronously(Plugin.GetPlugin(), new Runnable()
{
public void run()
{
Plugin.getRepository().addServerTransfer(playerTarget, serverTarget);
}
});
Plugin.AddTransferRecord(playerTarget, serverTarget);
UtilPlayer.message(player, F.main(Plugin.GetName(), C.cGray + "You have sent player: " + C.cGold + playerTarget + C.cGray + " to server: " + C.cGold + serverTarget + C.cGray + "!"));
return;

18
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
View File

@ -108,16 +108,13 @@ public class Portal extends MiniPlugin
public void AddTransferRecord(final String playerName, final String serverName)
{
synchronized (_transferLock)
Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
{
Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
public void run()
{
public void run()
{
_repository.addServerTransfer(playerName, serverName);
}
});
}
_repository.addServerTransfer(playerName, serverName);
}
});
}
public void DoesServerExist(final String serverName, final Callback<Boolean> callback)
@ -207,9 +204,4 @@ public class Portal extends MiniPlugin
});
}
}
public PortalRepository getRepository()
{
return _repository;
}
}