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

Commit left-over changes to merge and pull.

This commit is contained in:
Ty Sayers 2015-08-29 15:44:29 -07:00
parent aad5942242
commit 197309b914
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Game.Clans.Core/.classpath
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Database"/>

4
Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
View File

@ -135,7 +135,7 @@ public class ClanRepository extends RepositoryBase
* @param clanId - the id of the clan to move
* @param serverId - the id of the destination server being moved to
*/
public void moveClanServer(int clanId, String serverName, Callback<Boolean> callback)
public void moveClanServer(final int clanId, String serverName, final Callback<Boolean> callback)
{
executeQuery(GET_CLAN_SERVER, new ResultSetCallable()
{
@ -156,7 +156,7 @@ public class ClanRepository extends RepositoryBase
executeUpdate(UPDATE_CLAN_SERVER_ID, serverIdCol, clanIdCol);
}
callback.run(success);
callback.run(success);
}
}, new ColumnVarChar("serverName", 100, serverName));

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

@ -2,7 +2,7 @@ package mineplex.hub;
public enum HubType
{
Normal,
Normal,
Halloween,
Christmas
}

2
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerButton.java
View File

@ -20,7 +20,7 @@ public class ClanMoveServerButton implements IButton
{
_repository = repository;
_clan = clan;
_serverName = serverName;
_serverName = serverName;
}
@Override

23
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java
View File

@ -2,6 +2,9 @@ package mineplex.hub.server.ui.clans;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
import mineplex.core.account.CoreClientManager;
import mineplex.core.common.util.C;
@ -22,7 +25,7 @@ public class ClansServerShop extends ShopBase<ServerManager>
public ClansServerShop(ServerManager plugin, CoreClientManager clientManager, DonationManager donationManager)
{
super(plugin, clientManager, donationManager, "Clans");
System.out.println("initiateddd-----------------------------------");
_repository = new ClanRepository(plugin.getPlugin(), plugin.getStatusManager().getCurrentServerName());
}
@ -56,4 +59,22 @@ public class ClansServerShop extends ShopBase<ServerManager>
{
getPlugin().getHubManager().GetVisibility().removeHiddenPlayer(player);
}
// TODO: REMOVE THIS, JUST FOR DEBUGGING
@EventHandler
public void onPlayerInteract(PlayerInteractEvent event)
{
System.out.println("CALLED");
if (event.getPlayer().getName().equalsIgnoreCase("Elinoo")
|| event.getPlayer().getName().equalsIgnoreCase("MrTwiggy")
|| event.getPlayer().getName().equalsIgnoreCase("GetGrimyWits"))
{
System.out.println("CALLED2");
if (event.getPlayer().isSneaking() && event.getAction() == Action.RIGHT_CLICK_AIR)
{
System.out.println("CALLED3");
this.attemptShopOpen(event.getPlayer());
}
}
}
}