diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java index a64946a1c..00c35255c 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java @@ -238,10 +238,12 @@ public class UtilBlock blockUseSet.add((byte)69); //Lever blockUseSet.add((byte)71); //Iron Door blockUseSet.add((byte)77); //Button + blockUseSet.add((byte)85); //Fence (stupid minecraft) blockUseSet.add((byte)93); //Repeater blockUseSet.add((byte)94); //Repeater blockUseSet.add((byte)96); //Trapdoor blockUseSet.add((byte)107); //Fence Gate + blockUseSet.add((byte)113); //Nether Fence (stupid minecraft) blockUseSet.add((byte)116); //Enchantment Table blockUseSet.add((byte)117); //Brewing Stand blockUseSet.add((byte)130); //Ender Chest @@ -249,6 +251,22 @@ public class UtilBlock blockUseSet.add((byte)146); //Trapped Chest blockUseSet.add((byte)154); //Hopper blockUseSet.add((byte)158); //Dropper + + blockUseSet.add((byte)184); //Fences/Gates + blockUseSet.add((byte)185); //Fences/Gates + blockUseSet.add((byte)186); //Fences/Gates + blockUseSet.add((byte)187); //Fences/Gates + blockUseSet.add((byte)188); //Fences/Gates + blockUseSet.add((byte)189); //Fences/Gates + blockUseSet.add((byte)190); //Fences/Gates + blockUseSet.add((byte)191); //Fences/Gates + blockUseSet.add((byte)192); //Fences/Gates + + blockUseSet.add((byte)193); //Wood Doors + blockUseSet.add((byte)194); //Wood Doors + blockUseSet.add((byte)195); //Wood Doors + blockUseSet.add((byte)196); //Wood Doors + blockUseSet.add((byte)197); //Wood Doors } return blockUseSet.contains(block); diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInput.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInput.java new file mode 100644 index 000000000..75db062dd --- /dev/null +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilInput.java @@ -0,0 +1,121 @@ +package mineplex.core.common.util; + +import java.util.HashSet; + +public class UtilInput +{ + //Valid Chars + protected static HashSet validSet = new HashSet(); + protected static HashSet filterSet = new HashSet(); + + public static boolean valid(String input) + { + if (validSet.isEmpty()) + addChars(); + + for (char cur : input.toCharArray()) + if (!validSet.contains(cur)) + return false; + + return true; + } + + public static String filter(String input) + { + if (filterSet.isEmpty()) + addDictionary(); + + for (String cur : filterSet) + { + if (input.equalsIgnoreCase(cur)) + { + String out = "" + input.charAt(0); + while (out.length() < input.length()) + out += '*'; + return out; + } + } + + return input; + } + + public static void addDictionary() + { + filterSet.add("fuck"); + filterSet.add("shit"); + filterSet.add("cunt"); + filterSet.add("ass"); + filterSet.add("asshole"); + filterSet.add("faggot"); + filterSet.add("fag"); + filterSet.add("gay"); + } + + public static void addChars() + { + validSet.add('1'); + validSet.add('2'); + validSet.add('3'); + validSet.add('4'); + validSet.add('5'); + validSet.add('6'); + validSet.add('7'); + validSet.add('8'); + validSet.add('9'); + validSet.add('0'); + + validSet.add('a'); + validSet.add('b'); + validSet.add('c'); + validSet.add('d'); + validSet.add('e'); + validSet.add('f'); + validSet.add('g'); + validSet.add('h'); + validSet.add('i'); + validSet.add('j'); + validSet.add('k'); + validSet.add('l'); + validSet.add('m'); + validSet.add('n'); + validSet.add('o'); + validSet.add('p'); + validSet.add('q'); + validSet.add('r'); + validSet.add('s'); + validSet.add('t'); + validSet.add('u'); + validSet.add('v'); + validSet.add('w'); + validSet.add('x'); + validSet.add('y'); + validSet.add('z'); + + validSet.add('A'); + validSet.add('B'); + validSet.add('C'); + validSet.add('D'); + validSet.add('E'); + validSet.add('F'); + validSet.add('G'); + validSet.add('H'); + validSet.add('I'); + validSet.add('J'); + validSet.add('K'); + validSet.add('L'); + validSet.add('M'); + validSet.add('N'); + validSet.add('O'); + validSet.add('P'); + validSet.add('Q'); + validSet.add('R'); + validSet.add('S'); + validSet.add('T'); + validSet.add('U'); + validSet.add('V'); + validSet.add('W'); + validSet.add('X'); + validSet.add('Y'); + validSet.add('Z'); + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java index 3dd26bc38..db9db0530 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java @@ -1,6 +1,7 @@ package mineplex.core; import java.lang.reflect.Field; +import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -22,6 +23,7 @@ import net.minecraft.server.v1_7_R4.Packet; import net.minecraft.server.v1_7_R4.PacketPlayOutAttachEntity; import net.minecraft.server.v1_7_R4.PacketPlayOutEntityDestroy; import net.minecraft.server.v1_7_R4.PacketPlayOutEntityMetadata; +import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntity; import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntityLiving; import net.minecraft.server.v1_7_R4.WatchableObject; @@ -38,6 +40,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler private NautHashMap> _entityNameMap = new NautHashMap>(); private NautHashMap> _entityVehicleMap = new NautHashMap>(); private NautHashMap _loggedIn = new NautHashMap(); + private HashSet _ignoreSkulls = new HashSet(); private Field _destroyId; @@ -149,7 +152,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler { PacketPlayOutEntityMetadata metaPacket = (PacketPlayOutEntityMetadata)packet; - if (!_entityMap.get(owner).containsKey(metaPacket.a) && metaPacket.a != 777777) + if (!_entityMap.get(owner).containsKey(metaPacket.a) && metaPacket.a != 777777 && !_ignoreSkulls.contains(metaPacket.a)) { String entityName = ""; boolean nameShowing = false; @@ -198,6 +201,14 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler { exception.printStackTrace(); } + } + else if (packet instanceof PacketPlayOutSpawnEntity) + { + PacketPlayOutSpawnEntity spawnPacket = (PacketPlayOutSpawnEntity) packet; + if (spawnPacket.j == 66 && spawnPacket.a != 777777) + { + _ignoreSkulls.add(spawnPacket.a); + } } /* else if (packet instanceof PacketPlayOutAttachEntity) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/MiniClientPlugin.java b/Plugins/Mineplex.Core/src/mineplex/core/MiniClientPlugin.java index fa7f8ee95..b573392b0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/MiniClientPlugin.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/MiniClientPlugin.java @@ -7,25 +7,20 @@ import org.bukkit.event.EventHandler; import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.account.event.ClientUnloadEvent; -import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.common.util.NautHashMap; public abstract class MiniClientPlugin extends MiniPlugin { private static Object _clientDataLock = new Object(); + private NautHashMap _clientData = new NautHashMap(); + public MiniClientPlugin(String moduleName, JavaPlugin plugin) { super(moduleName, plugin); } - @EventHandler - public void loadPlayer(RetrieveClientInformationEvent event) - { - loadClientInformation(event); - } - @EventHandler public void UnloadPlayer(ClientUnloadEvent event) { @@ -70,6 +65,4 @@ public abstract class MiniClientPlugin extends MiniPlug } protected abstract DataType AddPlayer(String player); - - protected abstract void loadClientInformation(RetrieveClientInformationEvent event); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/MiniDbClientPlugin.java b/Plugins/Mineplex.Core/src/mineplex/core/MiniDbClientPlugin.java new file mode 100644 index 000000000..121ba66d7 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/MiniDbClientPlugin.java @@ -0,0 +1,25 @@ +package mineplex.core; + +import java.sql.ResultSet; +import java.sql.SQLException; + +import org.bukkit.plugin.java.JavaPlugin; + +import mineplex.core.account.CoreClientManager; +import mineplex.core.account.ILoginProcessor; + +public abstract class MiniDbClientPlugin extends MiniClientPlugin implements ILoginProcessor +{ + protected CoreClientManager ClientManager = null; + + public MiniDbClientPlugin(String moduleName, JavaPlugin plugin, CoreClientManager clientManager) + { + super(moduleName, plugin); + + ClientManager = clientManager; + + clientManager.addStoredProcedureLoginProcessor(this); + } + + public abstract void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException; +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/RankBenefitsGiver9000.java b/Plugins/Mineplex.Core/src/mineplex/core/RankBenefitsGiver9000.java deleted file mode 100644 index 06617f9ed..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/RankBenefitsGiver9000.java +++ /dev/null @@ -1,123 +0,0 @@ -package mineplex.core; - -import java.util.HashSet; - -import mineplex.core.account.CoreClientManager; -import mineplex.core.account.event.RetrieveClientInformationEvent; -import mineplex.core.common.Rank; -import mineplex.core.common.util.C; -import mineplex.core.common.util.F; -import mineplex.core.common.util.NautHashMap; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.inventory.InventoryManager; - -import org.bukkit.Bukkit; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.plugin.java.JavaPlugin; - -public class RankBenefitsGiver9000 extends MiniPlugin -{ - private CoreClientManager _clientManager; - private InventoryManager _inventoryManager; - private RankBenefitsGiver9000Repository _repository; - - private NautHashMap _playersNeedingBenefit = new NautHashMap(); - - public RankBenefitsGiver9000(JavaPlugin plugin, CoreClientManager clientManager, InventoryManager inventoryManager) - { - super("RankBenefitsGiver9000", plugin); - - _clientManager = clientManager; - _inventoryManager = inventoryManager; - _repository = new RankBenefitsGiver9000Repository(plugin); - } - - @EventHandler - public void loadPlayer(RetrieveClientInformationEvent event) - { - boolean treasureUpdate = false; - boolean horrorUpdate = false; - - for (String benefit : _repository.retrievePlayerBenefits(event.getUniqueId().toString())) - { - if (benefit.equalsIgnoreCase("TreasureUpdate")) - treasureUpdate = true; - - if (benefit.equalsIgnoreCase("HalloweenHorror")) - horrorUpdate = true; - } - - if (!horrorUpdate) - { - _playersNeedingBenefit.put(event.getPlayerName(), "Horror"); - } - - if (!treasureUpdate) - { - _playersNeedingBenefit.put(event.getPlayerName(), "Treasure"); - } - } - - @EventHandler(priority = EventPriority.LOWEST) - public void giveBenefit(final PlayerJoinEvent event) - { - if (!_playersNeedingBenefit.containsKey(event.getPlayer().getName())) - return; - - if (_playersNeedingBenefit.get(event.getPlayer().getName()).contains("Horror")) - { - _inventoryManager.addItemToInventory(event.getPlayer(), "Treasure", "Treasure Key", 2); - - Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() - { - public void run() - { - _repository.addBenefit(event.getPlayer().getUniqueId().toString(), "HalloweenHorror"); - } - }); - - Bukkit.getServer().getScheduler().runTaskLater(GetPlugin(), new Runnable() - { - public void run() - { - UtilPlayer.message(event.getPlayer(), C.cPurple + C.Strike + "============================================="); - UtilPlayer.message(event.getPlayer(), ""); - UtilPlayer.message(event.getPlayer(), C.cGold + C.Strike + "HAPPY HALLOWEEN"); - UtilPlayer.message(event.getPlayer(), "You received 2 Treasure Keys!"); - UtilPlayer.message(event.getPlayer(), ""); - UtilPlayer.message(event.getPlayer(), C.cPurple + C.Strike + "============================================="); - } - }, 5L); - } - else if (_playersNeedingBenefit.get(event.getPlayer().getName()).contains("Treasure")) - { - if (_clientManager.Get(event.getPlayer()).GetRank() == Rank.ALL) - { - _inventoryManager.addItemToInventory(event.getPlayer(), "Utility", "Treasure Chest", 1); - _inventoryManager.addItemToInventory(event.getPlayer(), "Treasure", "Treasure Key", 1); - } - else if (_clientManager.Get(event.getPlayer()).GetRank() == Rank.ULTRA) - { - _inventoryManager.addItemToInventory(event.getPlayer(), "Utility", "Treasure Chest", 20); - _inventoryManager.addItemToInventory(event.getPlayer(), "Treasure", "Treasure Key", 5); - } - else - { - _inventoryManager.addItemToInventory(event.getPlayer(), "Utility", "Treasure Chest", 40); - _inventoryManager.addItemToInventory(event.getPlayer(), "Treasure", "Treasure Key", 10); - } - - Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() - { - public void run() - { - _repository.addBenefit(event.getPlayer().getUniqueId().toString(), "TreasureUpdate"); - } - }); - } - - _playersNeedingBenefit.remove(event.getPlayer().getName()); - } -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/RankBenefitsGiver9000Repository.java b/Plugins/Mineplex.Core/src/mineplex/core/RankBenefitsGiver9000Repository.java deleted file mode 100644 index 7f591ea6a..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/RankBenefitsGiver9000Repository.java +++ /dev/null @@ -1,61 +0,0 @@ -package mineplex.core; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; - -import mineplex.core.database.DBPool; -import mineplex.core.database.RepositoryBase; -import mineplex.core.database.ResultSetCallable; -import mineplex.core.database.column.ColumnVarChar; - -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.java.JavaPlugin; - -public class RankBenefitsGiver9000Repository extends RepositoryBase -{ - // private static String CREATE_BENEFIT_TABLE = "CREATE TABLE IF NOT EXISTS rankBenefits (id INT NOT NULL AUTO_INCREMENT, uuid VARCHAR(100), benefit VARCHAR(100), PRIMARY KEY (id), INDEX rankUuid (uuid));"; - - private static String INSERT_BENEFIT = "INSERT INTO rankBenefits (uuid, benefit) VALUES (?, ?);"; - private static String RETRIEVE_BENEFITS = "SELECT benefit FROM rankBenefits WHERE uuid = ?;"; - - public RankBenefitsGiver9000Repository(JavaPlugin plugin) - { - super(plugin, "jdbc:mysql://db.mineplex.com:3306/Account?autoReconnect=true&failOverReadOnly=false&maxReconnects=10", "root", "tAbechAk3wR7tuTh"); - } - - @Override - protected void initialize() - { - // executeUpdate(CREATE_BENEFIT_TABLE); - } - - @Override - protected void update() - { - } - - public List retrievePlayerBenefits(String uuid) - { - final List benefits = new ArrayList(); - - executeQuery(RETRIEVE_BENEFITS, new ResultSetCallable() - { - public void processResultSet(ResultSet resultSet) throws SQLException - { - while (resultSet.next()) - { - benefits.add(resultSet.getString(1)); - } - } - }, new ColumnVarChar("uuid", 100, uuid)); - - return benefits; - } - - public void addBenefit(String uuid, String benefit) - { - executeUpdate(INSERT_BENEFIT, new ColumnVarChar("uuid", 100, uuid), new ColumnVarChar("benefit", 100, benefit)); - } -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java index 753b5de18..833e2a55a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java @@ -10,10 +10,8 @@ import java.util.UUID; import mineplex.core.MiniPlugin; import mineplex.core.account.command.UpdateRank; -import mineplex.core.account.event.AsyncClientLoadEvent; import mineplex.core.account.event.ClientUnloadEvent; import mineplex.core.account.event.ClientWebResponseEvent; -import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.account.repository.AccountRepository; import mineplex.core.account.repository.token.ClientToken; import mineplex.core.common.Rank; @@ -41,11 +39,15 @@ import org.bukkit.plugin.java.JavaPlugin; public class CoreClientManager extends MiniPlugin { + private static NautHashMap _clientLoginLock = new NautHashMap(); + private JavaPlugin _plugin; private AccountRepository _repository; private NautHashMap _clientList; private HashSet _duplicateLoginGlitchPreventionList; + private NautHashMap _loginProcessors = new NautHashMap(); + private Object _clientLock = new Object(); private static int _connectingClients = 0; @@ -187,38 +189,11 @@ public class CoreClientManager extends MiniPlugin client.SetAccountId(token.AccountId); client.SetRank(Rank.valueOf(token.Rank)); - final RetrieveClientInformationEvent clientInformationEvent = new RetrieveClientInformationEvent(client.GetPlayerName(), uuid); - clientInformationEvent.incrementProcessingCount(); - - Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() - { - public void run() - { - _repository.login(uuid.toString(), client.GetPlayerName()); - - Bukkit.getServer().getPluginManager().callEvent(clientInformationEvent); - clientInformationEvent.decreaseProcessingCount(); - } - }); + _repository.login(_loginProcessors, uuid.toString(), client.GetPlayerName()); // JSON sql response Bukkit.getServer().getPluginManager().callEvent(new ClientWebResponseEvent(response, uuid)); - // Load client in miniplugins - Bukkit.getServer().getPluginManager().callEvent(new AsyncClientLoadEvent(token, client)); - - while (clientInformationEvent.processing()) - { - try - { - Thread.sleep(1); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - } - Bukkit.getServer().getScheduler().runTask(GetPlugin(), new Runnable() { public void run() @@ -235,40 +210,38 @@ public class CoreClientManager extends MiniPlugin { TimingManager.start(client.GetPlayerName() + " LoadClient Total."); + _clientLoginLock.put(client.GetPlayerName(), new Object()); ClientToken token = null; Gson gson = new Gson(); - - final RetrieveClientInformationEvent clientInformationEvent = new RetrieveClientInformationEvent(client.GetPlayerName(), uuid); - Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() + runAsync(new Runnable() { public void run() { - _repository.login(uuid.toString(), client.GetPlayerName()); - - Bukkit.getServer().getPluginManager().callEvent(clientInformationEvent); + _repository.login(_loginProcessors, uuid.toString(), client.GetPlayerName()); + _clientLoginLock.remove(client.GetPlayerName()); } }); + TimingManager.start(client.GetPlayerName() + " GetClient."); String response = _repository.GetClient(client.GetPlayerName(), uuid, ipAddress); + TimingManager.stop(client.GetPlayerName() + " GetClient."); + token = gson.fromJson(response, ClientToken.class); client.SetAccountId(token.AccountId); client.SetRank(Rank.valueOf(token.Rank)); - _repository.updateMysqlRank(uuid.toString(), token.Rank, token.RankPerm, new Timestamp(Date.parse(token.RankExpire)).toString()); + // _repository.updateMysqlRank(uuid.toString(), token.Rank, token.RankPerm, new Timestamp(Date.parse(token.RankExpire)).toString()); // JSON sql response Bukkit.getServer().getPluginManager().callEvent(new ClientWebResponseEvent(response, uuid)); - // Load client in miniplugins - Bukkit.getServer().getPluginManager().callEvent(new AsyncClientLoadEvent(token, client)); - - while (clientInformationEvent.processing()) + while (_clientLoginLock.containsKey(client.GetPlayerName())) { try { - Thread.sleep(1); + Thread.sleep(2); } catch (InterruptedException e) { @@ -429,4 +402,9 @@ public class CoreClientManager extends MiniPlugin } } } + + public void addStoredProcedureLoginProcessor(ILoginProcessor processor) + { + _loginProcessors.put(processor.getName(), processor); + } } \ No newline at end of file diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java b/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java new file mode 100644 index 000000000..9ac886d69 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java @@ -0,0 +1,13 @@ +package mineplex.core.account; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public interface ILoginProcessor +{ + String getName(); + + void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException; + + String getQuery(String uuid, String name); +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java index c46ed1cc1..59b039dd2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java @@ -50,7 +50,7 @@ public class UpdateRank extends CommandBase final Rank rank = tempRank; - if (rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) + if ((rank == Rank.YOUTUBE && Plugin.Get(caller).GetRank().Has(Rank.OWNER)) || rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) { Plugin.getRepository().MatchPlayerName(new Callback>() { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/event/AsyncClientLoadEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/account/event/AsyncClientLoadEvent.java deleted file mode 100644 index 681d19ff3..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/event/AsyncClientLoadEvent.java +++ /dev/null @@ -1,41 +0,0 @@ -package mineplex.core.account.event; - -import mineplex.core.account.CoreClient; -import mineplex.core.account.repository.token.ClientToken; - -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -public class AsyncClientLoadEvent extends Event -{ - private static final HandlerList handlers = new HandlerList(); - - private ClientToken _token; - private CoreClient _client; - - public AsyncClientLoadEvent(ClientToken token, CoreClient client) - { - _token = token; - _client = client; - } - - public CoreClient GetClient() - { - return _client; - } - - public ClientToken GetClientToken() - { - return _token; - } - - public HandlerList getHandlers() - { - return handlers; - } - - public static HandlerList getHandlerList() - { - return handlers; - } -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/event/RetrieveClientInformationEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/account/event/RetrieveClientInformationEvent.java deleted file mode 100644 index a07d87528..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/event/RetrieveClientInformationEvent.java +++ /dev/null @@ -1,56 +0,0 @@ -package mineplex.core.account.event; - -import java.util.UUID; - -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -public class RetrieveClientInformationEvent extends Event -{ - private static final HandlerList handlers = new HandlerList(); - - private String _playerName; - private UUID _uuid; - private int _processingCount; - - public RetrieveClientInformationEvent(String playerName, UUID uuid) - { - _playerName = playerName; - _uuid = uuid; - } - - public HandlerList getHandlers() - { - return handlers; - } - - public static HandlerList getHandlerList() - { - return handlers; - } - - public String getPlayerName() - { - return _playerName; - } - - public UUID getUniqueId() - { - return _uuid; - } - - public void incrementProcessingCount() - { - _processingCount++; - } - - public boolean processing() - { - return _processingCount > 0; - } - - public void decreaseProcessingCount() - { - _processingCount--; - } -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java index 0cc308e0d..11070f4de 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java @@ -2,6 +2,7 @@ package mineplex.core.account.repository; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Statement; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; @@ -11,10 +12,12 @@ import org.bukkit.Bukkit; import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken; import org.bukkit.plugin.java.JavaPlugin; +import mineplex.core.account.ILoginProcessor; import mineplex.core.account.repository.token.LoginToken; import mineplex.core.account.repository.token.RankUpdateToken; import mineplex.core.common.Rank; import mineplex.core.common.util.Callback; +import mineplex.core.common.util.NautHashMap; import mineplex.core.common.util.UUIDFetcher; import mineplex.core.database.DatabaseRunnable; import mineplex.core.database.RepositoryBase; @@ -25,10 +28,9 @@ import mineplex.core.database.column.ColumnVarChar; import mineplex.core.server.remotecall.JsonWebCall; public class AccountRepository extends RepositoryBase -{ +{ private static String CREATE_ACCOUNT_TABLE = "CREATE TABLE IF NOT EXISTS accounts (id INT NOT NULL AUTO_INCREMENT, uuid VARCHAR(100), name VARCHAR(40), gems INT, rank VARCHAR(40), rankPerm BOOL, rankExpire LONG, lastLogin LONG, totalPlayTime LONG, PRIMARY KEY (id), UNIQUE INDEX uuidIndex (uuid), UNIQUE INDEX nameIndex (name), INDEX rankIndex (rank));"; - private static String ACCOUNT_LOGIN_NEW = "INSERT INTO accounts (uuid, name, lastLogin) values(?, ?, now()) ON DUPLICATE KEY UPDATE name=VALUES(name), lastLogin=VALUES(lastLogin);"; - private static String ACCOUNT_LOGIN_UPDATE = "UPDATE accounts SET uuid=?, name=?, lastLogin=now() WHERE uuid = ?;"; + private static String ACCOUNT_LOGIN_NEW = "INSERT INTO accounts (uuid, name, lastLogin) values(?, ?, now()) ON DUPLICATE KEY UPDATE name=VALUES(name), lastLogin=VALUES(lastLogin);"; private static String UPDATE_ACCOUNT_RANK = "UPDATE accounts SET rank=?, rankPerm=false, rankExpire=now() + INTERVAL 1 MONTH WHERE uuid = ?;"; private static String UPDATE_ACCOUNT_RANK_DONOR = "UPDATE accounts SET rank=?, donorRank=?, rankPerm=false, rankExpire=now() + INTERVAL 1 MONTH WHERE uuid = ?;"; private static String UPDATE_ACCOUNT_RANK_PERM = "UPDATE accounts SET rank=?, rankPerm=true WHERE uuid = ?;"; @@ -41,9 +43,34 @@ public class AccountRepository extends RepositoryBase public AccountRepository(JavaPlugin plugin, String webAddress) { - super(plugin, "jdbc:mysql://db.mineplex.com:3306/Account?autoReconnect=true&failOverReadOnly=false&maxReconnects=10", "root", "tAbechAk3wR7tuTh"); + super(plugin, "jdbc:mysql://db.mineplex.com:3306/Account?autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true", "root", "tAbechAk3wR7tuTh"); _webAddress = webAddress; + + Statement statement = null; + + try + { + statement = getConnection().createStatement(); + } + catch (Exception exception) + { + exception.printStackTrace(); + } + finally + { + if (statement != null) + { + try + { + statement.close(); + } + catch (SQLException e) + { + e.printStackTrace(); + } + } + } } @Override @@ -52,12 +79,105 @@ public class AccountRepository extends RepositoryBase executeUpdate(CREATE_ACCOUNT_TABLE); } - public void login(String uuid, String name) + public void login(NautHashMap loginProcessors, String uuid, String name) { - int affectedRows = executeUpdate(ACCOUNT_LOGIN_UPDATE, new ColumnVarChar("uuid", 100, uuid), new ColumnVarChar("name", 40, name), new ColumnVarChar("uuid", 100, uuid)); + Statement statement = null; + ResultSet resultSet = null; - if (affectedRows == 0) - executeUpdate(ACCOUNT_LOGIN_NEW, new ColumnVarChar("uuid", 100, uuid), new ColumnVarChar("name", 40, name)); + try + { + statement = getConnection().createStatement(); + + /* + boolean statementStatus = statement.execute( + "UPDATE accounts SET name='" + name + "', lastLogin=now() WHERE accounts.uuid = '" + uuid + "';" + + "SELECT games, visibility, showChat, friendChat, privateMessaging, partyRequests, invisibility, forcefield, showMacReports, ignoreVelocity, pendingFriendRequests FROM accountPreferences WHERE accountPreferences.uuid = '" + uuid + "' LIMIT 1;" + + "SELECT items.name, ic.name as category, count FROM accountInventory AS ai INNER JOIN items ON items.id = ai.itemId INNER JOIN itemCategories AS ic ON ic.id = items.categoryId INNER JOIN accounts ON accounts.id = ai.accountId WHERE accounts.uuid = '" + uuid + "';" + + "SELECT benefit FROM rankBenefits WHERE rankBenefits.uuid = '" + uuid + "';" + + "SELECT stats.name, value FROM accountStats INNER JOIN stats ON stats.id = accountStats.statId INNER JOIN accounts ON accountStats.accountId = accounts.id WHERE accounts.uuid = '" + uuid + "';" + + "SELECT tA.Name, status, serverName, tA.lastLogin, now() FROM accountFriend INNER Join accounts AS fA ON fA.uuid = uuidSource INNER JOIN accounts AS tA ON tA.uuid = uuidTarget LEFT JOIN playerMap ON tA.name = playerName WHERE uuidSource = '" + uuid + "';" + + "SELECT gameType, elo FROM eloRating WHERE uuid = '" + uuid + "';" + ); +*/ + + String loginString = "UPDATE accounts SET name='" + name + "', lastLogin=now() WHERE accounts.uuid = '" + uuid + "';"; + for (ILoginProcessor loginProcessor : loginProcessors.values()) + { + loginString += loginProcessor.getQuery(uuid, name); + } + + statement.execute(loginString); + + /* + while (true) + { + if (statementStatus) + { + System.out.println("ResultSet : " + statement.getResultSet().getMetaData().getColumnCount() + " columns:"); + + for (int i = 0; i < statement.getResultSet().getMetaData().getColumnCount(); i++) + { + System.out.println(statement.getResultSet().getMetaData().getColumnName(i + 1)); + } + } + else + { + if (statement.getUpdateCount() == -1) + break; + + System.out.println("Update statement : " + statement.getUpdateCount() + " rows affected."); + } + + statementStatus = statement.getMoreResults(); + } + + System.out.println("Done"); + */ + + boolean accountExists = statement.getUpdateCount() != 0; + + statement.getMoreResults(); + for (ILoginProcessor loginProcessor : loginProcessors.values()) + { + loginProcessor.processLoginResultSet(name, statement.getResultSet()); + statement.getMoreResults(); + } + + if (!accountExists) + { + executeUpdate(ACCOUNT_LOGIN_NEW, new ColumnVarChar("uuid", 100, uuid), new ColumnVarChar("name", 100, name)); + } + } + catch (Exception exception) + { + exception.printStackTrace(); + } + finally + { + if (statement != null) + { + try + { + statement.close(); + } + catch (SQLException e) + { + e.printStackTrace(); + } + } + + if (resultSet != null) + { + try + { + resultSet.close(); + } + catch (SQLException e) + { + e.printStackTrace(); + } + } + } } public String GetClient(String name, UUID uuid, String ipAddress) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java index 635bbeea5..0399433a6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java @@ -279,7 +279,7 @@ public enum Achievement SUPER_PAINTBALL_SPEEDRUNNER("Speedrunner", 1000, new String[]{"Super Paintball.Speedrunner"}, - new String[]{"Win a game in 20 seconds"}, + new String[]{"Win a game in 30 seconds"}, new int[]{1}, AchievementCategory.SUPER_PAINTBALL), @@ -323,7 +323,7 @@ public enum Achievement SNAKE_CANNIBAL("Cannibal", 1600, new String[]{"Snake.Cannibal"}, - new String[]{"Kill 8 players in a single game"}, + new String[]{"Kill 6 players in a single game"}, new int[]{1}, AchievementCategory.SNAKE), @@ -519,7 +519,7 @@ public enum Achievement MICRO_BATTLE_ANNIHILATION("Annihilation", 1200, new String[]{"Micro Battle.Annihilation"}, - new String[]{"Kill 12 players in one game"}, + new String[]{"Kill 8 players in one game"}, new int[]{1}, AchievementCategory.MICRO_BATTLE), diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antistack/AntiStack.java b/Plugins/Mineplex.Core/src/mineplex/core/antistack/AntiStack.java deleted file mode 100644 index adfd31e2b..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/antistack/AntiStack.java +++ /dev/null @@ -1,138 +0,0 @@ -package mineplex.core.antistack; - -import java.util.HashSet; - -import mineplex.core.MiniPlugin; -import mineplex.core.common.util.UtilMath; -import mineplex.core.updater.UpdateType; -import mineplex.core.updater.event.UpdateEvent; - -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack; -import org.bukkit.entity.Item; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.entity.ItemSpawnEvent; -import org.bukkit.event.inventory.InventoryPickupItemEvent; -import org.bukkit.event.player.PlayerPickupItemEvent; -import org.bukkit.plugin.java.JavaPlugin; - -public class AntiStack extends MiniPlugin -{ - private boolean _enabled = true; - - private HashSet _ignoreAround = new HashSet(); - - public AntiStack(JavaPlugin plugin) - { - super("AntiStack", plugin); - } - - @EventHandler(priority = EventPriority.MONITOR) - public void BlockBreak(BlockBreakEvent event) - { - if (!_enabled) - return; - - if (event.isCancelled()) - return; - - _ignoreAround.add(event.getBlock().getLocation().add(0.5, 0.5, 0.5)); - } - - @EventHandler - public void ClearIgnoreAround(UpdateEvent event) - { - if (!_enabled) - return; - - if (event.getType() != UpdateType.TICK) - return; - - _ignoreAround.clear(); - } - - @EventHandler (priority=EventPriority.HIGHEST) - public void ItemSpawn(ItemSpawnEvent event) - { - if (!_enabled) - return; - - if (event.isCancelled()) - return; - - Item item = event.getEntity(); - - for (Location loc : _ignoreAround) - if (UtilMath.offset(loc, event.getLocation()) < 2) - return; - - //ItemName() - if (item.getLocation().getY() < -10) - return; - - //Get Name - String name = ((CraftItemStack)item.getItemStack()).getHandle().getName(); - - //Append UID - name += ":" + item.getUniqueId(); - - //Set Name - ((CraftItemStack)item.getItemStack()).getHandle().c(name); - } - - @EventHandler (priority=EventPriority.HIGHEST) - public void PlayerPickup(PlayerPickupItemEvent event) - { - if (!_enabled) - return; - - if (event.isCancelled()) - return; - - Item item = event.getItem(); - - removeUID(item); - } - - @EventHandler - public void HopperPickup(InventoryPickupItemEvent event) - { - if (!_enabled) - return; - - if (event.isCancelled()) - return; - - Item item = event.getItem(); - - //Get Name - String name = ((CraftItemStack)item.getItemStack()).getHandle().getName(); - - //Remove UID - if (name.contains(":")) - name = name.substring(0, name.indexOf(":" + item.getUniqueId())); - - //Set Name - ((CraftItemStack)item.getItemStack()).getHandle().c(name); - } - - public void SetEnabled(boolean var) - { - _enabled = var; - } - - public static void removeUID(Item item) - { - //Get Name - String name = ((CraftItemStack)item.getItemStack()).getHandle().getName(); - - //Remove UID - if (name.contains(":")) - name = name.substring(0, name.indexOf(":" + item.getUniqueId())); - - //Set Name - ((CraftItemStack)item.getItemStack()).getHandle().c(name); - } -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java new file mode 100644 index 000000000..475a4812c --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java @@ -0,0 +1,9 @@ +package mineplex.core.benefit; + +import java.util.HashSet; + +public class BenefitData +{ + public HashSet Benefits = new HashSet(); + public boolean Loaded = false; +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java new file mode 100644 index 000000000..ed6d27253 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java @@ -0,0 +1,84 @@ +package mineplex.core.benefit; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +import mineplex.core.MiniDbClientPlugin; +import mineplex.core.account.CoreClientManager; +import mineplex.core.benefit.benefits.BenefitBase; +import mineplex.core.common.util.Callback; +import mineplex.core.inventory.InventoryManager; + +import org.bukkit.Bukkit; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.plugin.java.JavaPlugin; + +public class BenefitManager extends MiniDbClientPlugin +{ + private BenefitManagerRepository _repository; + + private List _benefits = new ArrayList(); + + public BenefitManager(JavaPlugin plugin, CoreClientManager clientManager, InventoryManager inventoryManager) + { + super("Benefit Manager", plugin, clientManager); + + _repository = new BenefitManagerRepository(plugin); + + //_benefits.add(new Thanksgiving2014(plugin, _repository, inventoryManager)); + } + + @EventHandler(priority = EventPriority.LOWEST) + public void giveBenefit(final PlayerJoinEvent event) + { + Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(GetPlugin(), new Runnable() + { + public void run() + { + if (Get(event.getPlayer()).Loaded) + { + for (final BenefitBase benefit : _benefits) + { + if (!Get(event.getPlayer()).Benefits.contains(benefit.getName())) + { + benefit.recordBenefit(event.getPlayer(), new Callback() + { + public void run(Boolean success) + { + if (success) + { + benefit.rewardPlayer(event.getPlayer()); + } + else + System.out.println("Benefit reward failed for " + event.getPlayer().getName()); + } + }); + } + } + } + } + }, 100L); + } + + @Override + protected BenefitData AddPlayer(String player) + { + return new BenefitData(); + } + + @Override + public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException + { + Set(playerName, _repository.retrievePlayerBenefitData(resultSet)); + } + + @Override + public String getQuery(String uuid, String name) + { + return "SELECT benefit FROM rankBenefits WHERE rankBenefits.uuid = '" + uuid + "';"; + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManagerRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManagerRepository.java new file mode 100644 index 000000000..2fa7140aa --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManagerRepository.java @@ -0,0 +1,49 @@ +package mineplex.core.benefit; + +import java.sql.ResultSet; +import java.sql.SQLException; + +import mineplex.core.database.RepositoryBase; +import mineplex.core.database.column.ColumnVarChar; + +import org.bukkit.plugin.java.JavaPlugin; + +public class BenefitManagerRepository extends RepositoryBase +{ + // private static String CREATE_BENEFIT_TABLE = "CREATE TABLE IF NOT EXISTS rankBenefits (id INT NOT NULL AUTO_INCREMENT, uuid VARCHAR(100), benefit VARCHAR(100), PRIMARY KEY (id), INDEX rankUuid (uuid));"; + + private static String INSERT_BENEFIT = "INSERT INTO rankBenefits (uuid, benefit) VALUES (?, ?);"; + + public BenefitManagerRepository(JavaPlugin plugin) + { + super(plugin, "jdbc:mysql://db.mineplex.com:3306/Account?autoReconnect=true&failOverReadOnly=false&maxReconnects=10", "root", "tAbechAk3wR7tuTh"); + } + + @Override + protected void initialize() + { + // executeUpdate(CREATE_BENEFIT_TABLE); + } + + @Override + protected void update() + { + } + + public boolean addBenefit(String uuid, String benefit) + { + return executeUpdate(INSERT_BENEFIT, new ColumnVarChar("uuid", 100, uuid), new ColumnVarChar("benefit", 100, benefit)) > 0; + } + + public BenefitData retrievePlayerBenefitData(ResultSet resultSet) throws SQLException + { + BenefitData playerBenefit = new BenefitData(); + + while (resultSet.next()) + { + playerBenefit.Benefits.add(resultSet.getString(1)); + } + + return playerBenefit; + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/benefit/benefits/BenefitBase.java b/Plugins/Mineplex.Core/src/mineplex/core/benefit/benefits/BenefitBase.java new file mode 100644 index 000000000..cadb0c849 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/benefit/benefits/BenefitBase.java @@ -0,0 +1,52 @@ +package mineplex.core.benefit.benefits; + +import mineplex.core.benefit.BenefitManagerRepository; +import mineplex.core.common.util.Callback; + +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; + +public abstract class BenefitBase +{ + private JavaPlugin _plugin; + private String _name; + private BenefitManagerRepository _repository; + + protected BenefitBase(JavaPlugin plugin, String name, BenefitManagerRepository repository) + { + _plugin = plugin; + _name = name; + _repository = repository; + } + + public JavaPlugin getPlugin() + { + return _plugin; + } + + public BenefitManagerRepository getRepository() + { + return _repository; + } + + public abstract void rewardPlayer(Player player); + + public void recordBenefit(final Player player, final Callback callback) + { + Bukkit.getServer().getScheduler().runTaskAsynchronously(_plugin, new Runnable() + { + public void run() + { + boolean success = _repository.addBenefit(player.getUniqueId().toString(), _name); + + callback.run(success); + } + }); + } + + public String getName() + { + return _name; + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/benefit/benefits/Thanksgiving2014.java b/Plugins/Mineplex.Core/src/mineplex/core/benefit/benefits/Thanksgiving2014.java new file mode 100644 index 000000000..c4a6c9b6b --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/benefit/benefits/Thanksgiving2014.java @@ -0,0 +1,43 @@ +package mineplex.core.benefit.benefits; + +import mineplex.core.benefit.BenefitManagerRepository; +import mineplex.core.common.util.C; +import mineplex.core.common.util.Callback; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.inventory.InventoryManager; + +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; + +public class Thanksgiving2014 extends BenefitBase +{ + private InventoryManager _inventoryManager; + + public Thanksgiving2014(JavaPlugin plugin, BenefitManagerRepository repository, InventoryManager inventoryManager) + { + super(plugin, "Thanksgiving2014", repository); + + _inventoryManager = inventoryManager; + } + + @Override + public void rewardPlayer(final Player player) + { + _inventoryManager.addItemToInventory(new Callback() + { + public void run(Boolean success) + { + if (success) + { + UtilPlayer.message(player, C.cPurple + C.Strike + "============================================="); + UtilPlayer.message(player, ""); + UtilPlayer.message(player, C.cGold + "HAPPY THANKSGIVING"); + UtilPlayer.message(player, "You received 1 Treasure Key!"); + UtilPlayer.message(player, ""); + UtilPlayer.message(player, C.cPurple + C.Strike + "============================================="); + } + } + }, player, "Treasure", "Treasure Key", 1); + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java index 1ce86888e..de8eef7f5 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java @@ -133,7 +133,7 @@ public class Menu extends ShopPageBase Bukkit.getServer().getPluginManager().callEvent(boosterEvent); if (!boosterEvent.isCancelled()) - Plugin.getInventoryManager().addItemToInventory(Player, "Utility", "Gem Booster", -1); + Plugin.getInventoryManager().addItemToInventory(null, Player, "Utility", "Gem Booster", -1); } else { @@ -262,7 +262,7 @@ public class Menu extends ShopPageBase { public void run() { - Plugin.getInventoryManager().addItemToInventory(Player, "Utility", "Gem Booster", 20); + Plugin.getInventoryManager().addItemToInventory(null, Player, "Utility", "Gem Booster", 20); Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, Player)); } }, null, gemBoosterItem, CurrencyType.Coins, Player)); @@ -322,7 +322,7 @@ public class Menu extends ShopPageBase { public void run() { - Plugin.getInventoryManager().addItemToInventory(Player, "Treasure", "Treasure Key", 1); + Plugin.getInventoryManager().addItemToInventory(null, Player, "Treasure", "Treasure Key", 1); Refresh(); } }, this, new TreasureKey(), CurrencyType.Coins, Player)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java index ae13f790d..f37853345 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java @@ -92,7 +92,7 @@ public class MountPage extends ShopPageBase { public void run() { - Plugin.getInventoryManager().addItemToInventory(Player, "Mount", mount.GetName(), 1); + Plugin.getInventoryManager().addItemToInventory(null, Player, "Mount", mount.GetName(), 1); Refresh(); } }, this, mount, CurrencyType.Coins, Player)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java index 068fed02b..2ad9efe9c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java @@ -103,7 +103,7 @@ public class PetTagPage extends ShopPageBase Plugin.getPetManager().Get(Player).GetPets().put(_pet.GetPetType(), token.PetName); - Plugin.getInventoryManager().addItemToInventory(Player, "Pet", _pet.GetPetType().toString(), 1); + Plugin.getInventoryManager().addItemToInventory(null, Player, "Pet", _pet.GetPetType().toString(), 1); Shop.OpenPageForPlayer(Player, new Menu(Plugin, Shop, ClientManager, DonationManager, Player)); } }, null, _petPurchase ? _pet : tag, CurrencyType.Coins, Player)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/database/RepositoryBase.java b/Plugins/Mineplex.Core/src/mineplex/core/database/RepositoryBase.java index 9b6cf846a..6ba7381e7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/database/RepositoryBase.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/database/RepositoryBase.java @@ -10,6 +10,7 @@ import java.util.Iterator; import mineplex.core.common.util.NautHashMap; import mineplex.core.database.column.Column; import mineplex.core.logger.Logger; +import mineplex.core.timing.TimingManager; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -77,6 +78,11 @@ public abstract class RepositoryBase implements Listener } protected int executeUpdate(String query, Column...columns) + { + return executeUpdate(query, null, columns); + } + + protected int executeUpdate(String query, ResultSetCallable callable, Column...columns) { PreparedStatement preparedStatement = null; @@ -95,6 +101,9 @@ public abstract class RepositoryBase implements Listener } affectedRows = preparedStatement.executeUpdate(); + + if (callable != null) + callable.processResultSet(preparedStatement.getGeneratedKeys()); } catch (Exception exception) { @@ -130,7 +139,7 @@ public abstract class RepositoryBase implements Listener } resultSet = statement.executeQuery(); - + callable.processResultSet(resultSet); } catch (Exception exception) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java index 54560761b..94859f263 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java @@ -113,11 +113,12 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler return _spawnPacketMap.get(entity.getEntityId()); } - public void addViewerToDisguise(DisguiseBase disguise, Player player) + public void addViewerToDisguise(DisguiseBase disguise, Player player, boolean reapply) { _disguisePlayerMap.get(disguise).add(player); - reApplyDisguise(disguise, player); + if (reapply) + reApplyDisguise(disguise, player); } public void removeViewerToDisguise(DisguiseBase disguise, Player player) @@ -151,6 +152,9 @@ public class DisguiseManager extends MiniPlugin implements IPacketHandler _spawnPacketMap.put(disguise.GetEntityId(), disguise); _disguisePlayerMap.put(disguise, new HashSet()); + for (Player player : players) + addViewerToDisguise(disguise, player, false); + if (disguise.GetEntity() instanceof Player && disguise instanceof DisguisePlayer) { if (!((Player)disguise.GetEntity()).getName().equalsIgnoreCase(((DisguisePlayer)disguise).getName())) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java index 0b559f9ba..70049fe90 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java @@ -68,7 +68,7 @@ public class DonationManager extends MiniPlugin synchronized (_donorLock) { _donors.put(token.Name, new Donor(token.DonorToken)); - _repository.updateGemsAndCoins(uuid, Get(token.Name).GetGems(), Get(token.Name).getCoins()); + //_repository.updateGemsAndCoins(uuid, Get(token.Name).GetGems(), Get(token.Name).getCoins()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloClientData.java b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloClientData.java new file mode 100644 index 000000000..2a4f86703 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloClientData.java @@ -0,0 +1,8 @@ +package mineplex.core.elo; + +import mineplex.core.common.util.NautHashMap; + +public class EloClientData +{ + public NautHashMap Elos = new NautHashMap(); +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java index 0aaac6e85..5aa465aa4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java @@ -1,16 +1,17 @@ package mineplex.core.elo; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.UUID; -import mineplex.core.MiniPlugin; -import mineplex.core.account.event.RetrieveClientInformationEvent; +import mineplex.core.MiniDbClientPlugin; +import mineplex.core.account.CoreClientManager; import mineplex.core.common.util.NautHashMap; import org.bukkit.Bukkit; -import org.bukkit.event.EventHandler; import org.bukkit.plugin.java.JavaPlugin; -public class EloManager extends MiniPlugin +public class EloManager extends MiniDbClientPlugin { private static Object _playerEloLock = new Object(); @@ -18,51 +19,15 @@ public class EloManager extends MiniPlugin private EloRatingSystem _ratingSystem; private NautHashMap> _playerElos; - public EloManager(JavaPlugin plugin) + public EloManager(JavaPlugin plugin, CoreClientManager clientManager) { - super("Elo Rating", plugin); - - setupConfigValues(plugin); - - _repository = new EloRepository(plugin.getConfig().getString("elo.connectionurl")); + super("Elo Rating", plugin, clientManager); + + _repository = new EloRepository(plugin); _ratingSystem = new EloRatingSystem(new KFactor(0, 1200, 25), new KFactor(1201, 1600, 20), new KFactor(1601, 2000, 15), new KFactor(2001, 2500, 10)); _playerElos = new NautHashMap>(); } - - private void setupConfigValues(JavaPlugin plugin) - { - try - { - plugin.getConfig().addDefault("elo.connectionurl", "jdbc:mysql://sqlstats.mineplex.com:3306/Mineplex?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"); - plugin.getConfig().set("elo.connectionurl", plugin.getConfig().getString("elo.connectionurl")); - plugin.saveConfig(); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - @EventHandler - public void retrievePlayersElos(final RetrieveClientInformationEvent event) - { - event.incrementProcessingCount(); - Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() - { - public void run() - { - NautHashMap eloMap = _repository.loadClientInformation(event.getUniqueId()); - - synchronized (_playerEloLock) - { - _playerElos.put(event.getUniqueId().toString(), eloMap); - } - - event.decreaseProcessingCount(); - } - }); - } - + public int getElo(UUID uuid, String gameType) { int elo = 1000; @@ -135,4 +100,22 @@ public class EloManager extends MiniPlugin } }); } + + @Override + protected EloClientData AddPlayer(String player) + { + return new EloClientData(); + } + + @Override + public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException + { + Set(playerName, _repository.loadClientInformation(resultSet)); + } + + @Override + public String getQuery(String uuid, String name) + { + return "SELECT gameType, elo FROM eloRating WHERE uuid = '" + uuid + "';"; + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloRepository.java index c3aab6735..4ccd6783e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloRepository.java @@ -1,172 +1,50 @@ package mineplex.core.elo; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.UUID; -import mineplex.core.common.util.NautHashMap; +import org.bukkit.plugin.java.JavaPlugin; -public class EloRepository +import mineplex.core.database.RepositoryBase; +import mineplex.core.database.column.ColumnInt; +import mineplex.core.database.column.ColumnVarChar; + +public class EloRepository extends RepositoryBase { - private String _connectionString; - private String _userName = "root"; - private String _password = "tAbechAk3wR7tuTh"; - private static String CREATE_ELO_TABLE = "CREATE TABLE IF NOT EXISTS eloRating (id INT NOT NULL AUTO_INCREMENT, uuid VARCHAR(256), gameType VARCHAR(256), elo INT, PRIMARY KEY (id), UNIQUE INDEX uuid_gameType_index (uuid, gameType));"; private static String INSERT_ELO = "INSERT INTO eloRating (uuid, gameType, elo) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE elo=VALUES(elo);"; - private static String RETRIEVE_ELO = "SELECT gameType, elo FROM eloRating WHERE uuid = ?;"; - private Connection _connection = null; - - public EloRepository(String connectionUrl) + public EloRepository(JavaPlugin plugin) { - _connectionString = connectionUrl; + super(plugin, "jdbc:mysql://db.mineplex.com:3306/Account?autoReconnect=true&failOverReadOnly=false&maxReconnects=10", "root", "tAbechAk3wR7tuTh"); initialize(); } public void initialize() { - PreparedStatement preparedStatement = null; - - try - { - _connection = DriverManager.getConnection(_connectionString, _userName, _password); - - // Create table - preparedStatement = _connection.prepareStatement(CREATE_ELO_TABLE); - preparedStatement.execute(); - } - catch (Exception exception) - { - exception.printStackTrace(); - } - finally - { - if (preparedStatement != null) - { - try - { - preparedStatement.close(); - } - catch (SQLException e) - { - e.printStackTrace(); - } - } - } + executeUpdate(CREATE_ELO_TABLE); } public void saveElo(String uuid, String gameType, int elo) { - PreparedStatement preparedStatement = null; - - int affectedRows = 0; - - try - { - if (_connection.isClosed()) - { - _connection = DriverManager.getConnection(_connectionString, _userName, _password); - } - - preparedStatement = _connection.prepareStatement(INSERT_ELO); - - preparedStatement.setString(1, uuid); - preparedStatement.setString(2, gameType); - preparedStatement.setInt(3, elo); - - affectedRows = preparedStatement.executeUpdate(); - - if (affectedRows == 0) - { - System.out.println("Error saving Elo."); - } - else - { - System.out.println("Saved '" + uuid + "' for '" + gameType + "' new elo " + elo); - } - - } - catch (Exception exception) - { - exception.printStackTrace(); - } - finally - { - if (preparedStatement != null) - { - try - { - preparedStatement.close(); - } - catch (SQLException e) - { - e.printStackTrace(); - } - } - } + executeUpdate(INSERT_ELO, new ColumnVarChar("uuid", 100, uuid), new ColumnVarChar("gameType", 100, gameType), new ColumnInt("elo", elo)); } - public NautHashMap loadClientInformation(UUID uuid) + public EloClientData loadClientInformation(ResultSet resultSet) throws SQLException { - NautHashMap elos = new NautHashMap(); - - ResultSet resultSet = null; - PreparedStatement preparedStatement = null; + EloClientData clientData = new EloClientData(); - try + while (resultSet.next()) { - if (_connection.isClosed()) - { - _connection = DriverManager.getConnection(_connectionString, _userName, _password); - } - - preparedStatement = _connection.prepareStatement(RETRIEVE_ELO); - preparedStatement.setString(1, uuid.toString()); - - resultSet = preparedStatement.executeQuery(); - - while (resultSet.next()) - { - elos.put(resultSet.getString(1), resultSet.getInt(2)); - } - } - catch (Exception exception) - { - exception.printStackTrace(); - } - finally - { - if (preparedStatement != null) - { - try - { - preparedStatement.close(); - } - catch (SQLException e) - { - e.printStackTrace(); - } - } - - if (resultSet != null) - { - try - { - resultSet.close(); - } - catch (SQLException e) - { - e.printStackTrace(); - } - } + clientData.Elos.put(resultSet.getString(1), resultSet.getInt(2)); } - return elos; + return clientData; } + @Override + protected void update() + { + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/energy/Energy.java b/Plugins/Mineplex.Core/src/mineplex/core/energy/Energy.java index e808da221..313bde55d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/energy/Energy.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/energy/Energy.java @@ -10,7 +10,6 @@ import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.MiniClientPlugin; import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.UpdateType; -import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; @@ -153,49 +152,8 @@ public class Energy extends MiniClientPlugin Get(player).MaxEnergyMods.remove(reason); } - @Override - protected void loadClientInformation(RetrieveClientInformationEvent event) - { - } - public void setEnabled(boolean b) { _enabled = b; } - - /* ENERGY NO LONGER USED ON ATTACK - public void AddEnergySwingMod(Player player, String reason, int amount) - { - Get(player).SwingEnergyMods.put(reason, amount); - } - - public void RemoveEnergySwingMod(Player player, String reason) - { - Get(player).SwingEnergyMods.remove(reason); - } - - @EventHandler - public void WeaponSwing(PlayerInteractEvent event) - { - if (!UtilEvent.isAction(event, ActionType.L)) - return; - - Player player = event.getPlayer(); - - if (!UtilGear.isWeapon(player.getItemInHand())) - return; - - if (player.hasPotionEffect(PotionEffectType.FAST_DIGGING)) - return; - - ModifyEnergy(player, -Get(player).SwingEnergy()); - } - - @EventHandler - public void ShootBow(EntityShootBowEvent event) - { - if (event.getEntity() instanceof Player) - ModifyEnergy((Player)event.getEntity(), -10); - } - */ } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java b/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java index 87e12f7fe..f07adb266 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/explosion/Explosion.java @@ -336,8 +336,8 @@ public class Explosion extends MiniPlugin if (blocks.get(cur).getValue() == 0 || blocks.get(cur).getValue() == 3) continue; - double chance = 0.2 + (double)_explosionBlocks.size()/(double)120; - if (Math.random() > Math.min(0.95, chance)) + double chance = 0.2 + (double)_explosionBlocks.size()/(double)80; + if (Math.random() > Math.min(0.98, chance)) { FallingBlock fall = cur.getWorld().spawnFallingBlock(cur.getLocation().add(0.5, 0.5, 0.5), blocks.get(cur).getKey(), blocks.get(cur).getValue()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java index 92daeeea0..6b80fb3c7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java @@ -1,5 +1,7 @@ package mineplex.core.friend; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -11,9 +13,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.MiniClientPlugin; +import mineplex.core.MiniDbClientPlugin; import mineplex.core.account.CoreClientManager; -import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.common.Rank; import mineplex.core.common.jsonchat.ChildJsonMessage; import mineplex.core.common.jsonchat.JsonMessage; @@ -31,19 +32,17 @@ import mineplex.core.preferences.PreferencesManager; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -public class FriendManager extends MiniClientPlugin +public class FriendManager extends MiniDbClientPlugin { private static FriendSorter _friendSorter = new FriendSorter(); - private CoreClientManager _clientManager; private PreferencesManager _preferenceManager; private FriendRepository _repository; public FriendManager(JavaPlugin plugin, CoreClientManager clientManager, PreferencesManager preferences) { - super("Friends", plugin); + super("Friends", plugin, clientManager); - _clientManager = clientManager; _preferenceManager = preferences; _repository = new FriendRepository(plugin); } @@ -61,20 +60,6 @@ public class FriendManager extends MiniClientPlugin return new FriendData(); } - @Override - protected void loadClientInformation(final RetrieveClientInformationEvent event) - { - event.incrementProcessingCount(); - Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() - { - public void run() - { - Set(event.getPlayerName(), _repository.loadClientInformation(event.getUniqueId())); - event.decreaseProcessingCount(); - } - }); - } - @EventHandler public void updateFriends(UpdateEvent event) { @@ -262,7 +247,7 @@ public class FriendManager extends MiniClientPlugin public void showFriends(Player caller) { - boolean isStaff = _clientManager.Get(caller).GetRank().Has(Rank.HELPER); + boolean isStaff = ClientManager.Get(caller).GetRank().Has(Rank.HELPER); boolean gotAFriend = false; List friendStatuses = Get(caller).Friends; Collections.sort(friendStatuses, _friendSorter); @@ -379,4 +364,16 @@ public class FriendManager extends MiniClientPlugin caller.sendMessage(C.cAqua + C.Strike + "====================================================="); } + + @Override + public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException + { + Set(playerName, _repository.loadClientInformation(resultSet)); + } + + @Override + public String getQuery(String uuid, String name) + { + return "SELECT tA.Name, status, serverName, tA.lastLogin, now() FROM accountFriend INNER Join accounts AS fA ON fA.uuid = uuidSource INNER JOIN accounts AS tA ON tA.uuid = uuidTarget LEFT JOIN playerMap ON tA.name = playerName WHERE uuidSource = '" + uuid + "';"; + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/data/FriendRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/data/FriendRepository.java index f5282e269..fccf0db30 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/friend/data/FriendRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/data/FriendRepository.java @@ -2,7 +2,6 @@ package mineplex.core.friend.data; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.UUID; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; @@ -17,15 +16,10 @@ public class FriendRepository extends RepositoryBase { private static String CREATE_FRIEND_TABLE = "CREATE TABLE IF NOT EXISTS accountFriend (id INT NOT NULL AUTO_INCREMENT, uuidSource VARCHAR(100), uuidTarget VARCHAR(100), status VARCHAR(100), PRIMARY KEY (id), UNIQUE INDEX uuidIndex (uuidSource, uuidTarget));"; private static String RETRIEVE_MULTIPLE_FRIEND_RECORDS = "SELECT uuidSource, tA.Name, status, serverName, tA.lastLogin, now() FROM accountFriend INNER Join accounts AS fA ON fA.uuid = uuidSource INNER JOIN accounts AS tA ON tA.uuid = uuidTarget LEFT JOIN playerMap ON tA.name = playerName WHERE uuidSource IN "; - private static String RETRIEVE_FRIEND_RECORDS = "SELECT tA.Name, status, serverName, tA.lastLogin, now() FROM accountFriend INNER Join accounts AS fA ON fA.uuid = uuidSource INNER JOIN accounts AS tA ON tA.uuid = uuidTarget LEFT JOIN playerMap ON tA.name = playerName WHERE uuidSource = ?;"; private static String ADD_FRIEND_RECORD = "INSERT INTO accountFriend (uuidSource, uuidTarget, status) SELECT fA.uuid AS uuidSource, tA.uuid AS uuidTarget, ? FROM accounts as fA LEFT JOIN accounts AS tA ON tA.name = ? WHERE fA.name = ?;"; private static String UPDATE_MUTUAL_RECORD = "UPDATE accountFriend AS aF INNER JOIN accounts as fA ON aF.uuidSource = fA.uuid INNER JOIN accounts AS tA ON aF.uuidTarget = tA.uuid SET aF.status = ? WHERE tA.name = ? AND fA.name = ?;"; private static String DELETE_FRIEND_RECORD = "DELETE aF FROM accountFriend AS aF INNER JOIN accounts as fA ON aF.uuidSource = fA.uuid INNER JOIN accounts AS tA ON aF.uuidTarget = tA.uuid WHERE fA.name = ? AND tA.name = ?;"; - - // Not mutual, need to drop accountFriend to recreate with constraint. - // On add record need to check for a reverse uuidsource/uuidtarget and set mutual - public FriendRepository(JavaPlugin plugin) { super(plugin, "jdbc:mysql://db.mineplex.com:3306/Account?autoReconnect=true&failOverReadOnly=false&maxReconnects=10", "root", "tAbechAk3wR7tuTh"); @@ -109,27 +103,21 @@ public class FriendRepository extends RepositoryBase return friends; } - public FriendData loadClientInformation(final UUID uniqueId) + public FriendData loadClientInformation(ResultSet resultSet) throws SQLException { - final FriendData friendData = new FriendData(); + FriendData friendData = new FriendData(); - executeQuery(RETRIEVE_FRIEND_RECORDS, new ResultSetCallable() + while (resultSet.next()) { - public void processResultSet(ResultSet resultSet) throws SQLException - { - while (resultSet.next()) - { - FriendStatus friend = new FriendStatus(); - - friend.Name = resultSet.getString(1); - friend.Status = Enum.valueOf(FriendStatusType.class, resultSet.getString(2)); - friend.ServerName = resultSet.getString(3); - friend.LastSeenOnline = resultSet.getTimestamp(5).getTime() - resultSet.getTimestamp(4).getTime(); - - friendData.Friends.add(friend); - } - } - }, new ColumnVarChar("uuidSource", 100, uniqueId.toString())); + FriendStatus friend = new FriendStatus(); + + friend.Name = resultSet.getString(1); + friend.Status = Enum.valueOf(FriendStatusType.class, resultSet.getString(2)); + friend.ServerName = resultSet.getString(3); + friend.LastSeenOnline = resultSet.getTimestamp(5).getTime() - resultSet.getTimestamp(4).getTime(); + + friendData.Friends.add(friend); + } return friendData; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java index c96088332..faff21e22 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java @@ -1,6 +1,6 @@ package mineplex.core.gadget.gadgets; -import java.util.HashSet; +import java.util.ArrayList; import java.util.Iterator; import org.bukkit.Effect; @@ -34,7 +34,7 @@ import mineplex.core.updater.event.UpdateEvent; public class ItemMelonLauncher extends ItemGadget implements IThrown { - private HashSet _melon = new HashSet(); + private ArrayList _melon = new ArrayList(); public ItemMelonLauncher(GadgetManager manager) { @@ -145,5 +145,11 @@ public class ItemMelonLauncher extends ItemGadget implements IThrown melon.remove(); } } + + while (_melon.size() > 60) + { + Item item = _melon.remove(0); + item.remove(); + } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/hologram/ArmorStandHologram.java b/Plugins/Mineplex.Core/src/mineplex/core/hologram/ArmorStandHologram.java deleted file mode 100644 index e0f66b2e1..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/hologram/ArmorStandHologram.java +++ /dev/null @@ -1,89 +0,0 @@ -package mineplex.core.hologram; - -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; -import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; -import org.bukkit.entity.Player; -import net.minecraft.server.v1_7_R4.DataWatcher; -import net.minecraft.server.v1_7_R4.EnumEntitySize; -import net.minecraft.server.v1_7_R4.MathHelper; -import net.minecraft.server.v1_7_R4.Packet; -import net.minecraft.server.v1_7_R4.PacketPlayOutEntityDestroy; -import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntityLiving; -import net.minecraft.server.v1_7_R4.PlayerConnection; - -import mineplex.core.common.DummyEntity; -import mineplex.core.common.util.UtilEnt; - -/** - * Created by Shaun on 9/5/2014. - */ -public class ArmorStandHologram -{ - private String _text; - private Packet _packet; - private int _entityId; - - public ArmorStandHologram(Location location, String text) - { - _text = text; - - _entityId = UtilEnt.getNewEntityId(); - _packet = createArmorStandPacket(location); - } - - public void sendToPlayer(Player player) - { - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(_packet); - } - - public void removeForPlayer(Player player) - { - PacketPlayOutEntityDestroy entityDestroyPacket = new PacketPlayOutEntityDestroy(_entityId); - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(entityDestroyPacket); - } - - private PacketPlayOutSpawnEntityLiving createArmorStandPacket(Location location) - { - final PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(); - packet.a = _entityId; - packet.b = (byte) 30; - packet.c = MathHelper.floor(location.getX() * 32D);//(int) EnumEntitySize.SIZE_2.a(100); - packet.d = MathHelper.floor((location.getY() - 0.8) * 32D);//(int) MathHelper.floor(64 * 32.0D); - packet.e = MathHelper.floor(location.getZ() * 32D);//(int)EnumEntitySize.SIZE_2.a(100); - packet.f = 0; // Velocity X - packet.g = 0; // Velocity Y - packet.h = 0; // Velocity Z - packet.i = (byte) 0; // Yaw - packet.j = (byte) 0; // Pitch - packet.k = (byte) 0; // Head Pitch - - final DataWatcher watcher = new DataWatcher(new DummyEntity(((CraftWorld)location.getWorld()).getHandle())); - - watcher.a(0, Byte.valueOf((byte)0)); - watcher.a(1, Short.valueOf((short)300)); - watcher.a(2, _text); - watcher.a(3, Byte.valueOf((byte) 1)); - watcher.a(4, Byte.valueOf((byte)0)); - watcher.a(7, Integer.valueOf(0)); - watcher.a(8, Byte.valueOf((byte)0)); - watcher.a(9, Byte.valueOf((byte)0)); - watcher.a(6, Float.valueOf(1.0F)); - watcher.a(10, Byte.valueOf((byte)0)); - - // Set invisible - int i1 = watcher.getInt(0); - watcher.watch(0, Byte.valueOf((byte)(i1 | 1 << 5))); - - // Set small and No Gravity - byte b1 = watcher.getByte(10); - b1 = (byte)(b1 | 0x1); - b1 = (byte)(b1 | 0x2); - watcher.watch(10, Byte.valueOf(b1)); - - packet.l = watcher; - - return packet; - } - -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java b/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java index 7244427fa..4f2750d45 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java @@ -1,68 +1,618 @@ package mineplex.core.hologram; -import org.bukkit.Location; -import org.bukkit.entity.Player; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map.Entry; +import net.minecraft.server.v1_7_R4.DataWatcher; +import net.minecraft.server.v1_7_R4.Packet; +import net.minecraft.server.v1_7_R4.PacketPlayOutAttachEntity; +import net.minecraft.server.v1_7_R4.PacketPlayOutEntityDestroy; +import net.minecraft.server.v1_7_R4.PacketPlayOutEntityMetadata; +import net.minecraft.server.v1_7_R4.PacketPlayOutEntityTeleport; +import net.minecraft.server.v1_7_R4.PacketPlayOutRelEntityMove; +import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntity; +import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntityLiving; + +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; +import org.bukkit.entity.Player; +import org.bukkit.util.Vector; + +import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilPlayer; -/** - * Created by shaun on 2014-09-09. - */ public class Hologram { - private HorseHologram _horseHologram; - private ArmorStandHologram _armorStandHologram; - private Location _location; - private String _text; + public enum HologramTarget + { + BLACKLIST, WHITELIST; + } - public Hologram(Location location, String text) - { - _location = location; - _text = text; + private Packet _destroy1_7; + private Packet _destroy1_8; + private boolean _destroyPackets = true; + /** + * 1.7 packets uses both EntityIDs while 1.8 uses only the first. + */ + private ArrayList> _entityIds = new ArrayList>(); + private boolean _isWitherSkull; + /** + * Keeps track of the holograms movements. This fixes offset that occasionally happens when moving a hologram around. + */ + private Vector _lastMovement; + private Location _location; + private boolean _makePackets = true; + private Packet[] _packets1_7; + private Packet[] _packets1_8; + private HashSet _playersInList = new HashSet(); + private ArrayList _playersTracking = new ArrayList(); + private HologramTarget _target = HologramTarget.BLACKLIST; + private String[] _text = new String[0]; + private int _viewDistance = 70; + private HologramManager _hologramManager; - _horseHologram = new HorseHologram(location, text); - _armorStandHologram = new ArmorStandHologram(location, text); - } + public Hologram(HologramManager hologramManager, Location location, String... text) + { + _hologramManager = hologramManager; + _location = location.clone(); + setText(text); + } - public void sendToPlayer(Player player) - { - if (UtilPlayer.is1_8(player)) - { - _armorStandHologram.sendToPlayer(player); - } - else - { - _horseHologram.sendToPlayer(player); - } - } + /** + * Adds the player to the Hologram to be effected by Whitelist or Blacklist + */ + public Hologram addPlayer(Player player) + { + return addPlayer(player.getName()); + } - public void sendToPlayers(Player... players) - { - for (Player player : players) - { - sendToPlayer(player); - } - } + /** + * Adds the player to the Hologram to be effected by Whitelist or Blacklist + */ + public Hologram addPlayer(String player) + { + _playersInList.add(player); + return this; + } - public void removeForPlayer(Player player) - { - if (UtilPlayer.is1_8(player)) - { - _armorStandHologram.removeForPlayer(player); - } - else - { - _horseHologram.removeForPlayer(player); - } - } + /** + * Is there a player entry in the hologram for Whitelist and Blacklist + */ + public boolean containsPlayer(Player player) + { + return _playersInList.contains(player.getName()); + } - public void removeForPlayers(Player... players) - { - for (Player player : players) - { - removeForPlayer(player); - } - } + /** + * Is there a player entry in the hologram for Whitelist and Blacklist + */ + public boolean containsPlayer(String player) + { + return _playersInList.contains(player); + } + + protected Packet getDestroyPacket(Player player) + { + if (_destroyPackets) + { + makeDestroyPacket(); + _destroyPackets = false; + } + return UtilPlayer.is1_8(player) ? _destroy1_8 : _destroy1_7; + } + + /** + * Get who can see the hologram + * + * @Whitelist = Only people added can see the hologram + * @Blacklist = Anyone but people added can see the hologram + */ + public HologramTarget getHologramTarget() + { + return _target; + } + + /** + * Get the hologram location + */ + public Location getLocation() + { + return _location.clone(); + } + + protected ArrayList getNearbyPlayers() + { + ArrayList nearbyPlayers = new ArrayList(); + for (Player player : getLocation().getWorld().getPlayers()) + { + if (isVisible(player)) + { + nearbyPlayers.add(player); + } + } + return nearbyPlayers; + } + + protected Packet[] getSpawnPackets(Player player) + { + if (_makePackets) + { + makeSpawnPackets(); + _makePackets = false; + } + return UtilPlayer.is1_8(player) ? _packets1_8 : _packets1_7; + } + + /** + * Get the text in the hologram + */ + public String[] getText() + { + // We reverse it again as the hologram would otherwise display the text from the bottom row to the top row + String[] reversed = new String[_text.length]; + for (int i = 0; i < reversed.length; i++) + { + reversed[i] = _text[reversed.length - (i + 1)]; + } + return reversed; + } + + /** + * Get the view distance the hologram is viewable from. Default is 70 + */ + public int getViewDistance() + { + return _viewDistance; + } + + /** + * Is the hologram holograming? + */ + public boolean isInUse() + { + return _lastMovement != null; + } + + /** + * Does the hologram use the wither skull for 1.8 clients? + */ + public boolean isUsingWitherSkull() + { + return _isWitherSkull; + } + + public boolean isVisible(Player player) + { + if (getLocation().getWorld() == player.getWorld()) + { + if ((getHologramTarget() == HologramTarget.WHITELIST) == containsPlayer(player)) + { + if (getLocation().distance(player.getLocation()) < getViewDistance()) + { + return true; + } + } + } + return false; + } + + private void makeDestroyPacket() + { + int[] entityIds1_7 = new int[_entityIds.size() * 2]; + int[] entityIds1_8 = new int[_entityIds.size()]; + for (int i = 0; i < _entityIds.size(); i++) + { + Entry entry = _entityIds.get(i); + entityIds1_7[i * 2] = entry.getKey(); + entityIds1_7[(i * 2) + 1] = entry.getValue(); + entityIds1_8[i] = entry.getKey(); + } + _destroy1_7 = new PacketPlayOutEntityDestroy(entityIds1_7); + _destroy1_8 = new PacketPlayOutEntityDestroy(entityIds1_8); + } + + private void makeSpawnPackets() + { + _packets1_7 = new Packet[_text.length * 3]; + _packets1_8 = new Packet[_text.length * (isUsingWitherSkull() ? 2 : 1)]; + if (_entityIds.size() < _text.length) + { + _destroyPackets = true; + for (int i = _entityIds.size(); i < _text.length; i++) + { + _entityIds.add(new HashMap.SimpleEntry(UtilEnt.getNewEntityId(), UtilEnt.getNewEntityId())); + } + } + else + { + _destroyPackets = true; + while (_entityIds.size() > _text.length) + { + _entityIds.remove(_text.length); + } + } + for (int textRow = 0; textRow < _text.length; textRow++) + { + Entry entityIds = this._entityIds.get(textRow); + Packet[] packets1_7 = makeSpawnPackets1_7(textRow, entityIds.getKey(), entityIds.getValue(), _text[textRow]); + for (int i = 0; i < packets1_7.length; i++) + { + _packets1_7[(textRow * 3) + i] = packets1_7[i]; + } + + Packet[] packets1_8 = makeSpawnPackets1_8(textRow, entityIds.getKey(), _text[textRow]); + for (int i = 0; i < packets1_8.length; i++) + { + _packets1_8[(textRow * (isUsingWitherSkull() ? 2 : 1)) + i] = packets1_8[i]; + } + } + } + + private Packet[] makeSpawnPackets1_7(int height, int witherId, int horseId, String horseName) + { + // Spawn wither skull + PacketPlayOutSpawnEntity spawnWitherSkull = new PacketPlayOutSpawnEntity(); + spawnWitherSkull.a = witherId; + spawnWitherSkull.b = (int) (getLocation().getX() * 32); + spawnWitherSkull.c = (int) ((getLocation().getY() + 54.6 + ((double) height * 0.285D)) * 32); + spawnWitherSkull.d = (int) (getLocation().getZ() * 32); + spawnWitherSkull.j = 66; + // Spawn horse + PacketPlayOutSpawnEntityLiving spawnHorse = new PacketPlayOutSpawnEntityLiving(); + spawnHorse.a = horseId; + spawnHorse.b = 100; + spawnHorse.c = (int) (getLocation().getX() * 32); + spawnHorse.d = (int) ((getLocation().getY() + 54.83 + ((double) height * 0.285D) + 0.23D) * 32); + spawnHorse.e = (int) (getLocation().getZ() * 32); + // Setup datawatcher + DataWatcher watcher = new DataWatcher(null); + watcher.a(0, (byte) 0); + watcher.a(1, (short) 300); + watcher.a(10, horseName); + watcher.a(11, (byte) 1); + watcher.a(12, -1700000); + spawnHorse.l = watcher; + // Make horse ride wither + PacketPlayOutAttachEntity attachEntity = new PacketPlayOutAttachEntity(); + attachEntity.b = horseId; + attachEntity.c = witherId; + return new Packet[] + { + spawnWitherSkull, spawnHorse, attachEntity + }; + } + + private Packet[] makeSpawnPackets1_8(int textRow, int entityId, String lineOfText) + { + if (this.isUsingWitherSkull()) + { + PacketPlayOutSpawnEntity spawnPacket = new PacketPlayOutSpawnEntity(); + spawnPacket.a = entityId; + spawnPacket.b = (int) (getLocation().getX() * 32); + spawnPacket.c = (int) ((getLocation().getY() + -0.55 + ((double) textRow * 0.285)) * 32); + spawnPacket.d = (int) (getLocation().getZ() * 32); + spawnPacket.j = 66; + // Setup datawatcher for wither skull + PacketPlayOutEntityMetadata metadataPacket = new PacketPlayOutEntityMetadata(); + metadataPacket.a = entityId; + DataWatcher watcher = new DataWatcher(null); + watcher.a(0, (byte) 0); + watcher.a(2, lineOfText); + watcher.a(3, (byte) 1); + metadataPacket.b = watcher.c(); + return new Packet[] + { + spawnPacket, metadataPacket + }; + } + else + { + PacketPlayOutSpawnEntityLiving packet = new PacketPlayOutSpawnEntityLiving(); + packet.a = entityId; + packet.b = 30; + packet.c = (int) (getLocation().getX() * 32); + packet.d = (int) ((getLocation().getY() + -2.1 + ((double) textRow * 0.285)) * 32); + packet.e = (int) (getLocation().getZ() * 32); + // Setup datawatcher for armor stand + DataWatcher watcher = new DataWatcher(null); + watcher.a(0, (byte) 32); + watcher.a(2, lineOfText); + watcher.a(3, (byte) 1); + packet.l = watcher; + return new Packet[] + { + packet + }; + } + } + + /** + * Removes the player from the Hologram so they are no longer effected by Whitelist or Blacklist + */ + public Hologram removePlayer(Player player) + { + return addPlayer(player.getName()); + } + + /** + * Removes the player from the Hologram so they are no longer effected by Whitelist or Blacklist + */ + public Hologram removePlayer(String player) + { + _playersInList.remove(player); + return this; + } + + /** + * Set who can see the hologram + * + * @Whitelist = Only people added can see the hologram + * @Blacklist = Anyone but people added can see the hologram + */ + public Hologram setHologramTarget(HologramTarget newTarget) + { + this._target = newTarget; + return this; + } + + /** + * Sets the hologram to appear at this location + */ + public Hologram setLocation(Location newLocation) + { + _makePackets = true; + Location oldLocation = getLocation(); + _location = newLocation.clone(); + if (isInUse()) + { + ArrayList canSee = getNearbyPlayers(); + Iterator itel = _playersTracking.iterator(); + while (itel.hasNext()) + { + Player player = itel.next(); + if (!canSee.contains(player)) + { + itel.remove(); + if (player.getWorld() == getLocation().getWorld()) + { + ((CraftPlayer) player).getHandle().playerConnection.sendPacket(getDestroyPacket(player)); + } + } + } + itel = canSee.iterator(); + while (itel.hasNext()) + { + Player player = itel.next(); + if (!_playersTracking.contains(player)) + { + _playersTracking.add(player); + itel.remove(); + for (Packet packet : getSpawnPackets(player)) + { + ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); + } + } + } + if (!canSee.isEmpty()) + { + _lastMovement.add(new Vector(newLocation.getX() - oldLocation.getX(), newLocation.getY() - oldLocation.getY(), + newLocation.getZ() - oldLocation.getZ())); + int x = (int) Math.floor(32 * _lastMovement.getX()); + int y = (int) Math.floor(32 * _lastMovement.getY()); + int z = (int) Math.floor(32 * _lastMovement.getZ()); + Packet[] packets1_7 = new Packet[_text.length]; + Packet[] packets1_8 = new Packet[_text.length]; + int i = 0; + if (x >= -128 && x <= 127 && y >= -128 && y <= 127 && z >= -128 && z <= 127) + { + _lastMovement.subtract(new Vector(x / 32D, y / 32D, z / 32D)); + for (Entry entityId : this._entityIds) + { + PacketPlayOutRelEntityMove relMove = new PacketPlayOutRelEntityMove(); + relMove.a = entityId.getKey(); + relMove.b = (byte) x; + relMove.c = (byte) y; + relMove.d = (byte) z; + packets1_7[i] = relMove; + packets1_8[i] = relMove; + i++; + } + } + else + { + x = (int) Math.floor(32 * newLocation.getX()); + z = (int) Math.floor(32 * newLocation.getZ()); + _lastMovement = new Vector(newLocation.getX() - (x / 32D), 0, newLocation.getZ() - (z / 32D)); + for (Entry entityId : this._entityIds) + { + for (int b = 0; b < 2; b++) + { + PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(); + teleportPacket.a = entityId.getKey(); + teleportPacket.b = x; + teleportPacket.c = (int) Math.floor((oldLocation.getY() + + (b == 0 ? 54.6 : isUsingWitherSkull() ? -0.55 : -2.1) + ((double) i * 0.285)) * 32); + teleportPacket.d = z; + if (b == 0) + { + packets1_7[i] = teleportPacket; + } + else + { + packets1_8[i] = teleportPacket; + } + } + i++; + } + } + for (Player player : canSee) + { + for (Packet packet : UtilPlayer.is1_8(player) ? packets1_8 : packets1_7) + { + ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); + } + } + } + } + return this; + } + + /** + * Set the hologram text + */ + public Hologram setText(String... newText) + { + String[] reversed = new String[newText.length]; + for (int i = 0; i < reversed.length; i++) + { + reversed[i] = newText[reversed.length - (i + 1)]; + } + if (reversed.equals(_text)) + return this; + _makePackets = true; + if (isInUse()) + { + ArrayList packets1_7 = new ArrayList(); + int[] destroy1_7 = new int[0]; + int[] destroy1_8 = new int[0]; + ArrayList packets1_8 = new ArrayList(); + if (_text.length != reversed.length) + { + _destroyPackets = true; + } + for (int textRow = 0; textRow < Math.max(_text.length, reversed.length); textRow++) + { + // You can safely assume that _entityIds here is containing _text.length amount as this code is inside isInUse + if (textRow >= _text.length) + { + // Add entity id and send spawn packets + // You add a entity id because the new hologram needs + Entry entry = new HashMap.SimpleEntry(UtilEnt.getNewEntityId(), UtilEnt.getNewEntityId()); + _entityIds.add(entry); + packets1_7.addAll(Arrays.asList(makeSpawnPackets1_7(textRow, entry.getKey(), entry.getValue(), + reversed[textRow]))); + packets1_8.addAll(Arrays.asList(makeSpawnPackets1_8(textRow, entry.getKey(), reversed[textRow]))); + } + else if (textRow >= reversed.length) + { + // Remove entity id and send destroy packets + Entry entry = _entityIds.remove(reversed.length); + destroy1_7 = Arrays.copyOf(destroy1_7, destroy1_7.length + 2); + destroy1_7[destroy1_7.length - 2] = entry.getKey(); + destroy1_7[destroy1_7.length - 1] = entry.getValue(); + destroy1_8 = Arrays.copyOf(destroy1_8, destroy1_8.length + 1); + destroy1_8[destroy1_8.length - 1] = entry.getKey(); + } + else if (!reversed[textRow].equals(_text[textRow])) + { + // Send update metadata packets + Entry entry = _entityIds.get(textRow); + PacketPlayOutEntityMetadata metadata1_7 = new PacketPlayOutEntityMetadata(); + metadata1_7.a = entry.getValue(); + DataWatcher watcher1_7 = new DataWatcher(null); + watcher1_7.a(0, (byte) 0); + watcher1_7.a(1, (short) 300); + watcher1_7.a(10, reversed[textRow]); + watcher1_7.a(11, (byte) 1); + watcher1_7.a(12, -1700000); + metadata1_7.b = watcher1_7.c(); + packets1_7.add(metadata1_7); + + PacketPlayOutEntityMetadata metadata1_8 = new PacketPlayOutEntityMetadata(); + metadata1_8.a = entry.getKey(); + DataWatcher watcher1_8 = new DataWatcher(null); + watcher1_8.a(0, (byte) 0); + watcher1_8.a(2, reversed[textRow]); + watcher1_8.a(3, (byte) 1); + metadata1_8.b = watcher1_8.c(); + packets1_8.add(metadata1_8); + } + } + if (destroy1_7.length > 0) + { + packets1_7.add(new PacketPlayOutEntityDestroy(destroy1_7)); + } + if (destroy1_8.length > 0) + { + packets1_8.add(new PacketPlayOutEntityDestroy(destroy1_8)); + } + for (Player player : _playersTracking) + { + for (Packet packet : UtilPlayer.is1_8(player) ? packets1_8 : packets1_7) + { + ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); + } + } + } + _text = reversed; + return this; + } + + /** + * Tells the hologram to use the wither skull instead of armorstand for 1.8 clients + */ + public Hologram setUsesWitherSkull() + { + _isWitherSkull = true; + return this; + } + + /** + * Set the distance the hologram is viewable from. Default is 70 + */ + public Hologram setViewDistance(int newDistance) + { + this._viewDistance = newDistance; + return setLocation(getLocation()); + } + + protected ArrayList getPlayersTracking() + { + return _playersTracking; + } + + /** + * Start the hologram + */ + public Hologram start() + { + if (!isInUse()) + { + _hologramManager.addHologram(this); + _playersTracking.addAll(getNearbyPlayers()); + for (Player player : _playersTracking) + { + for (Packet packet : getSpawnPackets(player)) + { + ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); + } + } + _lastMovement = new Vector(); + } + return this; + } + + /** + * Stop the hologram + */ + public Hologram stop() + { + if (isInUse()) + { + _hologramManager.removeHologram(this); + for (Player player : _playersTracking) + { + ((CraftPlayer) player).getHandle().playerConnection.sendPacket(getDestroyPacket(player)); + } + _playersTracking.clear(); + _lastMovement = null; + } + return this; + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/hologram/HologramManager.java b/Plugins/Mineplex.Core/src/mineplex/core/hologram/HologramManager.java new file mode 100644 index 000000000..5fc38db29 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/hologram/HologramManager.java @@ -0,0 +1,84 @@ +package mineplex.core.hologram; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; +import net.minecraft.server.v1_7_R4.Packet; + +import org.bukkit.Bukkit; +import org.bukkit.World; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.plugin.java.JavaPlugin; + +public class HologramManager implements Listener +{ + private ArrayList _activeHolograms = new ArrayList(); + + public HologramManager(JavaPlugin arcadeManager) + { + Bukkit.getPluginManager().registerEvents(this, arcadeManager); + } + + void addHologram(Hologram hologram) + { + _activeHolograms.add(hologram); + } + + void removeHologram(Hologram hologram) + { + _activeHolograms.remove(hologram); + } + + @EventHandler(priority = EventPriority.LOWEST) + public void onTick(UpdateEvent event) + { + if (event.getType() != UpdateType.TICK || _activeHolograms.isEmpty()) + return; + List worlds = Bukkit.getWorlds(); + Iterator itel = _activeHolograms.iterator(); + while (itel.hasNext()) + { + Hologram hologram = itel.next(); + if (!worlds.contains(hologram.getLocation().getWorld())) + { + itel.remove(); + hologram.stop(); + } + else + { + ArrayList canSee = hologram.getNearbyPlayers(); + Iterator itel2 = hologram.getPlayersTracking().iterator(); + while (itel2.hasNext()) + { + Player player = itel2.next(); + if (!canSee.contains(player)) + { + itel2.remove(); + if (player.getWorld() == hologram.getLocation().getWorld()) + { + ((CraftPlayer) player).getHandle().playerConnection.sendPacket(hologram.getDestroyPacket(player)); + } + } + } + for (Player player : canSee) + { + if (!hologram.getPlayersTracking().contains(player)) + { + hologram.getPlayersTracking().add(player); + for (Packet packet : hologram.getSpawnPackets(player)) + { + ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); + } + } + } + } + } + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/hologram/HorseHologram.java b/Plugins/Mineplex.Core/src/mineplex/core/hologram/HorseHologram.java deleted file mode 100644 index 3f268e531..000000000 --- a/Plugins/Mineplex.Core/src/mineplex/core/hologram/HorseHologram.java +++ /dev/null @@ -1,132 +0,0 @@ -package mineplex.core.hologram; - -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; -import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; -import org.bukkit.entity.Player; -import net.minecraft.server.v1_7_R4.EntityFireball; -import net.minecraft.server.v1_7_R4.EntityHorse; -import net.minecraft.server.v1_7_R4.EntitySmallFireball; -import net.minecraft.server.v1_7_R4.Packet; -import net.minecraft.server.v1_7_R4.PacketPlayOutAttachEntity; -import net.minecraft.server.v1_7_R4.PacketPlayOutEntityDestroy; -import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntity; -import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntityLiving; -import net.minecraft.server.v1_7_R4.World; - -import mineplex.core.common.util.UtilServer; - -/** - * Created by Shaun on 8/29/2014. - */ -public class HorseHologram -{ - /** - * HorseHologram creates the required entities to spawn in a hologram. It is possible to send the packets for the entities to a player, - * but it is also possible to add the entities to the nmsWorld to keep them loaded into the server. - */ - - private Location _location; - private String _text; - - private World _nmsWorld; - private EntityFireball _fireball; - private EntityHorse _horse; - - public HorseHologram(Location location, String text) - { - _location = location; - _text = text; - - _nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - - // Create Entities - _fireball = new EntitySmallFireball(_nmsWorld); - _horse = new EntityHorse(_nmsWorld); - - // Location Data - _fireball.setLocation(_location.getX(), _location.getY() + 55.25, _location.getZ(), 0, 0); - _horse.setLocation(_location.getX(), _location.getY() + 55.25, _location.getZ(), 0, 0); - _horse.setAge(-1700000); - _horse.setCustomName(_text); - _horse.setCustomNameVisible(true); - } - - public void sendToPlayer(Player player) - { - Packet fireballSpawn = getFireballSpawnPacket(); - Packet horseSpawn = getHorseSpawnPacket(); - Packet attachPacket = getAttachEntityPacket(); - - sendPacket(player, fireballSpawn); - sendPacket(player, horseSpawn); - sendPacket(player, attachPacket); - } - - public void removeForPlayer(Player player) - { - Packet horseDestroy = getHorseDestroyPacket(); - Packet fireballDestroy = getFireballDestroyPacket(); - - sendPacket(player, horseDestroy); - sendPacket(player, fireballDestroy); - } - - public void spawnWithPackets() - { - for (Player player : UtilServer.getPlayers()) - { - sendToPlayer(player); - } - } - - public void removeWithPackets() - { - for (Player player : UtilServer.getPlayers()) - { - removeForPlayer(player); - } - } - - public void setText(String text) - { - _text = text; - _horse.setCustomName(_text); - } - - public String getText() - { - return _text; - } - - private Packet getHorseSpawnPacket() - { - return new PacketPlayOutSpawnEntityLiving(_horse); - } - - private Packet getFireballSpawnPacket() - { - return new PacketPlayOutSpawnEntity(_fireball, 64); - } - - private Packet getAttachEntityPacket() - { - return new PacketPlayOutAttachEntity(0, _horse, _fireball); - } - - private Packet getHorseDestroyPacket() - { - return new PacketPlayOutEntityDestroy(_horse.getId()); - } - - private Packet getFireballDestroyPacket() - { - return new PacketPlayOutEntityDestroy(_fireball.getId()); - } - - private void sendPacket(Player player, Packet packet) - { - ((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet); - } - -} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java b/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java index 62a1c7fe3..59db640d0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java @@ -1,5 +1,7 @@ package mineplex.core.inventory; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.List; import java.util.Map; @@ -7,15 +9,16 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.MiniClientPlugin; -import mineplex.core.account.event.RetrieveClientInformationEvent; +import mineplex.core.MiniDbClientPlugin; +import mineplex.core.account.CoreClientManager; +import mineplex.core.common.util.Callback; import mineplex.core.common.util.NautHashMap; import mineplex.core.inventory.command.GiveItemCommand; import mineplex.core.inventory.data.Category; import mineplex.core.inventory.data.InventoryRepository; import mineplex.core.inventory.data.Item; -public class InventoryManager extends MiniClientPlugin +public class InventoryManager extends MiniDbClientPlugin { private static Object _inventoryLock = new Object(); @@ -24,9 +27,9 @@ public class InventoryManager extends MiniClientPlugin private NautHashMap _items = new NautHashMap(); private NautHashMap _categories = new NautHashMap(); - public InventoryManager(JavaPlugin plugin) + public InventoryManager(JavaPlugin plugin, CoreClientManager clientManager) { - super("Inventory Manager", plugin); + super("Inventory Manager", plugin, clientManager); _repository = new InventoryRepository(plugin); @@ -66,14 +69,36 @@ public class InventoryManager extends MiniClientPlugin } } - public void addItemToInventory(Player player, String category, String item, int count) + public void addItemToInventory(final Player player, String category, final String item, final int count) { if (_items.containsKey(item)) { Get(player).addItem(new ClientItem(_items.get(item), count)); } - addItemToInventoryForOffline(player.getUniqueId().toString(), category, item, count); + addItemToInventory(null, player, category, item, count); + } + + public void addItemToInventory(final Callback callback, final Player player, String category, final String item, final int count) + { + addItemToInventoryForOffline(new Callback() + { + public void run(Boolean success) + { + if (!success) + { + System.out.println("Add item to Inventory FAILED for " + player.getName()); + + if (_items.containsKey(item)) + { + Get(player).addItem(new ClientItem(_items.get(item), -count)); + } + } + + if (callback != null) + callback.run(success); + } + }, player.getUniqueId().toString(), category, item, count); } public Item getItem(String itemName) @@ -93,7 +118,7 @@ public class InventoryManager extends MiniClientPlugin return item; } - public void addItemToInventoryForOffline(final String uuidString, final String category, final String item, final int count) + public void addItemToInventoryForOffline(final Callback callback, final String uuidString, final String category, final String item, final int count) { Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() { @@ -123,7 +148,18 @@ public class InventoryManager extends MiniClientPlugin synchronized (_inventoryLock) { - _repository.incrementClientInventoryItem(uuidString, _items.get(item).Id, count); + final boolean success = _repository.incrementClientInventoryItem(uuidString, _items.get(item).Id, count); + + if (callback != null) + { + Bukkit.getServer().getScheduler().runTask(GetPlugin(), new Runnable() + { + public void run() + { + callback.run(success); + } + }); + } } } }); @@ -135,23 +171,21 @@ public class InventoryManager extends MiniClientPlugin return new ClientInventory(); } - @Override - protected void loadClientInformation(final RetrieveClientInformationEvent event) - { - event.incrementProcessingCount(); - Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() - { - public void run() - { - Set(event.getPlayerName(), _repository.loadClientInformation(event.getUniqueId().toString())); - event.decreaseProcessingCount(); - } - }); - } - @Override public void AddCommands() { addCommand(new GiveItemCommand(this)); } + + @Override + public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException + { + Set(playerName, _repository.loadClientInformation(resultSet)); + } + + @Override + public String getQuery(String uuid, String name) + { + return "SELECT items.name, ic.name as category, count FROM accountInventory AS ai INNER JOIN items ON items.id = ai.itemId INNER JOIN itemCategories AS ic ON ic.id = items.categoryId INNER JOIN accounts ON accounts.id = ai.accountId WHERE accounts.uuid = '" + uuid + "';"; + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/inventory/command/GiveItemCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/inventory/command/GiveItemCommand.java index 2978842fe..28c92639e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/inventory/command/GiveItemCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/inventory/command/GiveItemCommand.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; +import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UUIDFetcher; import mineplex.core.common.util.UtilPlayer; @@ -23,7 +24,7 @@ public class GiveItemCommand extends CommandBase } @Override - public void Execute(Player caller, String[] args) + public void Execute(final Player caller, String[] args) { if (args == null || args.length < 3) { @@ -33,13 +34,15 @@ public class GiveItemCommand extends CommandBase final String playerName = args[0]; final int amount = Integer.parseInt(args[1]); - String itemName = ""; + String itemNameTemp = ""; for (int i = 2; i < args.length; i++) { - itemName += args[i] + " "; + itemNameTemp += args[i] + " "; } - itemName = itemName.trim(); + itemNameTemp = itemNameTemp.trim(); + + final String itemName = itemNameTemp; Item item = Plugin.getItem(itemName); Player player = UtilPlayer.searchExact(playerName); @@ -59,8 +62,13 @@ public class GiveItemCommand extends CommandBase UUID uuid = UUIDFetcher.getUUIDOf(playerName); if (uuid != null) { - Plugin.addItemToInventoryForOffline(uuid.toString(), item.Category, item.Name, amount); - UtilPlayer.message(caller, F.main("Item", "You gave " + F.elem(amount + " " + itemName) + " to offline player " + F.name(playerName))); + Plugin.addItemToInventoryForOffline(new Callback() + { + public void run (Boolean success) + { + UtilPlayer.message(caller, F.main("Item", "You gave " + F.elem(amount + " " + itemName) + " to offline player " + F.name(playerName))); + } + }, uuid.toString(), item.Category, item.Name, amount); } else { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java index 37d1c186e..e2d63d345 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java @@ -27,7 +27,6 @@ public class InventoryRepository extends RepositoryBase private static String RETRIEVE_CATEGORIES = "SELECT id, name FROM itemCategories;"; private static String INSERT_CLIENT_INVENTORY = "INSERT INTO accountInventory (accountId, itemId, count) SELECT accounts.id, ?, ? FROM accounts WHERE accounts.uuid = ? ON DUPLICATE KEY UPDATE count=count + VALUES(count);"; - private static String RETRIEVE_CLIENT_INVENTORY = "SELECT items.name, ic.name as category, count FROM accountInventory AS ai INNER JOIN items ON items.id = ai.itemId INNER JOIN itemCategories AS ic ON ic.id = items.categoryId INNER JOIN accounts ON accounts.id = ai.accountId WHERE accounts.uuid = ?;"; public InventoryRepository(JavaPlugin plugin) { @@ -93,25 +92,19 @@ public class InventoryRepository extends RepositoryBase return items; } - public void incrementClientInventoryItem(String uuid, int itemId, int count) + public boolean incrementClientInventoryItem(String uuid, int itemId, int count) { - executeUpdate(INSERT_CLIENT_INVENTORY, new ColumnInt("itemid", itemId), new ColumnInt("count", count), new ColumnVarChar("uuid", 100, uuid)); + return executeUpdate(INSERT_CLIENT_INVENTORY, new ColumnInt("itemid", itemId), new ColumnInt("count", count), new ColumnVarChar("uuid", 100, uuid)) > 0; } - public ClientInventory loadClientInformation(String uuid) + public ClientInventory loadClientInformation(ResultSet resultSet) throws SQLException { final ClientInventory clientInventory = new ClientInventory(); - - executeQuery(RETRIEVE_CLIENT_INVENTORY, new ResultSetCallable() + + while (resultSet.next()) { - public void processResultSet(ResultSet resultSet) throws SQLException - { - while (resultSet.next()) - { - clientInventory.addItem(new ClientItem(new Item(resultSet.getString(1), resultSet.getString(2)), resultSet.getInt(3))); - } - } - }, new ColumnVarChar("uuid", 100, uuid)); + clientInventory.addItem(new ClientItem(new Item(resultSet.getString(1), resultSet.getString(2)), resultSet.getInt(3))); + } return clientInventory; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java b/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java index d52f5eb99..83a4b4b28 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java @@ -857,9 +857,12 @@ public class ItemStackFactory extends MiniPlugin stack.setItemMeta(itemMeta); //Unbreakable - ItemMeta meta = stack.getItemMeta(); - meta.spigot().setUnbreakable(true); - stack.setItemMeta(meta); + if (stack.getType().getMaxDurability() > 1) + { + ItemMeta meta = stack.getItemMeta(); + meta.spigot().setUnbreakable(true); + stack.setItemMeta(meta); + } return stack; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java index f88ad5d5d..0b5364cd9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java @@ -9,7 +9,6 @@ import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.MiniClientPlugin; import mineplex.core.account.CoreClientManager; -import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -210,9 +209,4 @@ public class MessageManager extends MiniClientPlugin { return _clientManager; } - - @Override - protected void loadClientInformation(RetrieveClientInformationEvent event) - { - } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/movement/Movement.java b/Plugins/Mineplex.Core/src/mineplex/core/movement/Movement.java index 055225468..f2e39156a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/movement/Movement.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/movement/Movement.java @@ -1,7 +1,6 @@ package mineplex.core.movement; import mineplex.core.MiniClientPlugin; -import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.common.util.UtilMath; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -45,9 +44,4 @@ public class Movement extends MiniClientPlugin { return new ClientMovement(); } - - @Override - protected void loadClientInformation(RetrieveClientInformationEvent event) - { - } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/Pet.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/Pet.java index e0800c516..4bc68c8dc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/Pet.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/Pet.java @@ -3,7 +3,6 @@ package mineplex.core.pet; import mineplex.core.common.CurrencyType; import mineplex.core.pet.repository.token.PetSalesToken; import mineplex.core.shop.item.SalesPackageBase; -import mineplex.core.shop.item.ShopItem; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java index d8ee4751c..8cc4d8bff 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetExtra.java @@ -1,11 +1,9 @@ package mineplex.core.pet; import mineplex.core.common.CurrencyType; -import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.pet.repository.token.PetExtraToken; import mineplex.core.shop.item.SalesPackageBase; -import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java index 60b9b1b6a..80221103b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java @@ -11,14 +11,10 @@ import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.UpdateType; import mineplex.core.account.CoreClientManager; import mineplex.core.account.event.ClientWebResponseEvent; -import mineplex.core.account.event.RetrieveClientInformationEvent; -import mineplex.core.common.util.C; import mineplex.core.common.util.NautHashMap; import mineplex.core.common.util.UtilEnt; -import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilServer; import mineplex.core.donation.DonationManager; -import mineplex.core.itemstack.ItemStackFactory; import net.minecraft.server.v1_7_R4.EntityCreature; import net.minecraft.server.v1_7_R4.EntityHuman; import net.minecraft.server.v1_7_R4.EntityInsentient; @@ -27,15 +23,7 @@ import net.minecraft.server.v1_7_R4.PathfinderGoalLookAtPlayer; import net.minecraft.server.v1_7_R4.PathfinderGoalRandomLookaround; import net.minecraft.server.v1_7_R4.PathfinderGoalSelector; - - - - - - - import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; @@ -46,18 +34,13 @@ import org.bukkit.entity.Ageable; import org.bukkit.entity.Creature; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; -import org.bukkit.entity.Skeleton; import org.bukkit.entity.Zombie; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.java.JavaPlugin; @@ -394,11 +377,6 @@ public class PetManager extends MiniClientPlugin { return _activePetOwners.get(name); } - - @Override - protected void loadClientInformation(RetrieveClientInformationEvent event) - { - } public void DisableAll() { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java index c9e783eb4..309cf6d79 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java @@ -1,8 +1,9 @@ package mineplex.core.preferences; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.Map.Entry; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -12,9 +13,8 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.MiniClientPlugin; +import mineplex.core.MiniDbClientPlugin; import mineplex.core.account.CoreClientManager; -import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.common.util.NautHashMap; import mineplex.core.donation.DonationManager; import mineplex.core.itemstack.ItemStackFactory; @@ -23,7 +23,7 @@ import mineplex.core.preferences.ui.PreferencesShop; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -public class PreferencesManager extends MiniClientPlugin +public class PreferencesManager extends MiniDbClientPlugin { private PreferencesRepository _repository; private PreferencesShop _shop; @@ -34,7 +34,7 @@ public class PreferencesManager extends MiniClientPlugin public PreferencesManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager) { - super("Preferences", plugin); + super("Preferences", plugin, clientManager); setupConfigValues(); @@ -64,20 +64,6 @@ public class PreferencesManager extends MiniClientPlugin return new UserPreferences(); } - @Override - protected void loadClientInformation(final RetrieveClientInformationEvent event) - { - event.incrementProcessingCount(); - Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() - { - public void run() - { - Set(event.getPlayerName(), _repository.loadClientInformation(event.getUniqueId())); - event.decreaseProcessingCount(); - } - }); - } - public void savePreferences(Player caller) { _saveBuffer.put(caller.getUniqueId().toString(), Get(caller)); @@ -134,4 +120,16 @@ public class PreferencesManager extends MiniClientPlugin { _shop.attemptShopOpen(caller); } + + @Override + public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException + { + Set(playerName, _repository.loadClientInformation(resultSet)); + } + + @Override + public String getQuery(String uuid, String name) + { + return "SELECT games, visibility, showChat, friendChat, privateMessaging, partyRequests, invisibility, forcefield, showMacReports, ignoreVelocity, pendingFriendRequests FROM accountPreferences WHERE accountPreferences.uuid = '" + uuid + "' LIMIT 1;"; + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java index 767ecbad2..21689dc1b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java @@ -4,20 +4,17 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Map.Entry; -import java.util.UUID; import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.common.util.NautHashMap; import mineplex.core.database.RepositoryBase; -import mineplex.core.database.ResultSetCallable; import mineplex.core.database.column.ColumnVarChar; public class PreferencesRepository extends RepositoryBase { private static String CREATE_ACCOUNT_TABLE = "CREATE TABLE IF NOT EXISTS accountPreferences (id INT NOT NULL AUTO_INCREMENT, uuid VARCHAR(256), games BOOL NOT NULL DEFAULT 1, visibility BOOL NOT NULL DEFAULT 1, showChat BOOL NOT NULL DEFAULT 1, friendChat BOOL NOT NULL DEFAULT 1, privateMessaging BOOL NOT NULL DEFAULT 1, partyRequests BOOL NOT NULL DEFAULT 0, invisibility BOOL NOT NULL DEFAULT 0, forcefield BOOL NOT NULL DEFAULT 0, showMacReports BOOL NOT NULL DEFAULT 0, ignoreVelocity BOOL NOT NULL DEFAULT 0, PRIMARY KEY (id), UNIQUE INDEX uuid_index (uuid));"; private static String INSERT_ACCOUNT = "INSERT INTO accountPreferences (uuid) VALUES (?) ON DUPLICATE KEY UPDATE uuid=uuid;"; - private static String RETRIEVE_ACCOUNT_PREFERENCES = "SELECT games, visibility, showChat, friendChat, privateMessaging, partyRequests, invisibility, forcefield, showMacReports, ignoreVelocity, pendingFriendRequests FROM accountPreferences WHERE uuid = ?;"; private static String UPDATE_ACCOUNT_PREFERENCES = "UPDATE accountPreferences SET games = ?, visibility = ?, showChat = ?, friendChat = ?, privateMessaging = ?, partyRequests = ?, invisibility = ?, forcefield = ?, showMacReports = ?, ignoreVelocity = ?, pendingFriendRequests = ? WHERE uuid=?;"; public PreferencesRepository(JavaPlugin plugin, String connectionString) @@ -61,8 +58,33 @@ public class PreferencesRepository extends RepositoryBase preparedStatement.addBatch(); } + + int[] rowsAffected = preparedStatement.executeBatch(); + int i = 0; - preparedStatement.executeBatch(); + for (Entry entry : preferences.entrySet()) + { + if (rowsAffected[i] < 1) + { + executeUpdate(INSERT_ACCOUNT, new ColumnVarChar("uuid", 100, entry.getKey())); + + preparedStatement.setBoolean(1, entry.getValue().HubGames); + preparedStatement.setBoolean(2, entry.getValue().ShowPlayers); + preparedStatement.setBoolean(3, entry.getValue().ShowChat); + preparedStatement.setBoolean(4, entry.getValue().FriendChat); + preparedStatement.setBoolean(5, entry.getValue().PrivateMessaging); + preparedStatement.setBoolean(6, entry.getValue().PartyRequests); + preparedStatement.setBoolean(7, entry.getValue().Invisibility); + preparedStatement.setBoolean(8, entry.getValue().HubForcefield); + preparedStatement.setBoolean(9, entry.getValue().ShowMacReports); + preparedStatement.setBoolean(10, entry.getValue().IgnoreVelocity); + preparedStatement.setBoolean(11, entry.getValue().PendingFriendRequests); + preparedStatement.setString(12, entry.getKey()); + preparedStatement.execute(); + } + + i++; + } } catch (Exception exception) { @@ -84,34 +106,24 @@ public class PreferencesRepository extends RepositoryBase } } - public UserPreferences loadClientInformation(final UUID uuid) + public UserPreferences loadClientInformation(final ResultSet resultSet) throws SQLException { final UserPreferences preferences = new UserPreferences(); - executeQuery(RETRIEVE_ACCOUNT_PREFERENCES, new ResultSetCallable() + if (resultSet.next()) { - public void processResultSet(ResultSet resultSet) throws SQLException - { - if (!resultSet.next()) - { - executeUpdate(INSERT_ACCOUNT, new ColumnVarChar("uuid", 100, uuid.toString())); - } - else - { - preferences.HubGames = resultSet.getBoolean(1); - preferences.ShowPlayers = resultSet.getBoolean(2); - preferences.ShowChat = resultSet.getBoolean(3); - preferences.FriendChat = resultSet.getBoolean(4); - preferences.PrivateMessaging = resultSet.getBoolean(5); - preferences.PartyRequests = resultSet.getBoolean(6); - preferences.Invisibility = resultSet.getBoolean(7); - preferences.HubForcefield = resultSet.getBoolean(8); - preferences.ShowMacReports = resultSet.getBoolean(9); - preferences.IgnoreVelocity = resultSet.getBoolean(10); - preferences.PendingFriendRequests = resultSet.getBoolean(11); - } - } - }, new ColumnVarChar("uuid", 100, uuid.toString())); + preferences.HubGames = resultSet.getBoolean(1); + preferences.ShowPlayers = resultSet.getBoolean(2); + preferences.ShowChat = resultSet.getBoolean(3); + preferences.FriendChat = resultSet.getBoolean(4); + preferences.PrivateMessaging = resultSet.getBoolean(5); + preferences.PartyRequests = resultSet.getBoolean(6); + preferences.Invisibility = resultSet.getBoolean(7); + preferences.HubForcefield = resultSet.getBoolean(8); + preferences.ShowMacReports = resultSet.getBoolean(9); + preferences.IgnoreVelocity = resultSet.getBoolean(10); + preferences.PendingFriendRequests = resultSet.getBoolean(11); + } return preferences; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java index 8a776d29d..8069b4154 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java @@ -1,21 +1,21 @@ package mineplex.core.stats; -import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.sql.SQLException; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.MiniClientPlugin; -import mineplex.core.account.event.RetrieveClientInformationEvent; +import mineplex.core.MiniDbClientPlugin; +import mineplex.core.account.CoreClientManager; import mineplex.core.common.util.NautHashMap; import mineplex.core.common.util.UtilServer; import mineplex.core.stats.command.GiveStatCommand; import mineplex.core.stats.command.TimeCommand; import mineplex.core.stats.event.StatChangeEvent; -public class StatsManager extends MiniClientPlugin +public class StatsManager extends MiniDbClientPlugin { private static Object _statSync = new Object(); @@ -25,9 +25,9 @@ public class StatsManager extends MiniClientPlugin private NautHashMap> _statUploadQueue = new NautHashMap>(); private Runnable _saveRunnable; - public StatsManager(JavaPlugin plugin) + public StatsManager(JavaPlugin plugin, CoreClientManager clientManager) { - super("StatsManager", plugin); + super("Stats Manager", plugin, clientManager); _repository = new StatsRepository(plugin); @@ -117,20 +117,6 @@ public class StatsManager extends MiniClientPlugin return new PlayerStats(); } - @Override - protected void loadClientInformation(final RetrieveClientInformationEvent event) - { - event.incrementProcessingCount(); - Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() - { - public void run() - { - Set(event.getPlayerName(), _repository.loadClientInformation(event.getUniqueId().toString())); - event.decreaseProcessingCount(); - } - }); - } - public PlayerStats getOfflinePlayerStats(String playerName) throws SQLException { return _repository.loadOfflinePlayerStats(playerName); @@ -185,4 +171,16 @@ public class StatsManager extends MiniClientPlugin addCommand(new TimeCommand(this)); addCommand(new GiveStatCommand(this)); } + + @Override + public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException + { + Set(playerName, _repository.loadClientInformation(resultSet)); + } + + @Override + public String getQuery(String uuid, String name) + { + return "SELECT stats.name, value FROM accountStats INNER JOIN stats ON stats.id = accountStats.statId INNER JOIN accounts ON accountStats.accountId = accounts.id WHERE accounts.uuid = '" + uuid + "';"; + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java index d00079f1a..8429c4f3b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java @@ -1,6 +1,5 @@ package mineplex.core.stats; -import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; @@ -14,17 +13,12 @@ import mineplex.core.database.RepositoryBase; import mineplex.core.database.ResultSetCallable; import mineplex.core.database.column.ColumnVarChar; import mineplex.database.Tables; -import mineplex.database.tables.records.AccountStatsRecord; -import mineplex.database.tables.records.StatsRecord; + import org.jooq.DSLContext; import org.jooq.Insert; -import org.jooq.InsertQuery; -import org.jooq.Query; -import org.jooq.Record; import org.jooq.Record2; import org.jooq.Result; import org.jooq.Update; -import org.jooq.UpdateQuery; import org.jooq.impl.DSL; public class StatsRepository extends RepositoryBase @@ -32,7 +26,6 @@ public class StatsRepository extends RepositoryBase private static String CREATE_STAT_TABLE = "CREATE TABLE IF NOT EXISTS stats (id INT NOT NULL AUTO_INCREMENT, name VARCHAR(100), PRIMARY KEY (id), UNIQUE INDEX nameIndex (name));"; private static String CREATE_STAT_RELATION_TABLE = "CREATE TABLE IF NOT EXISTS accountStats (id INT NOT NULL AUTO_INCREMENT, accountId INT NOT NULL, statId INT NOT NULL, value INT NOT NULL, PRIMARY KEY (id), FOREIGN KEY (accountId) REFERENCES accounts(id), FOREIGN KEY (statId) REFERENCES stats(id), UNIQUE INDEX accountStatIndex (accountId, statId));"; - private static String RETRIEVE_PLAYER_STATS = "SELECT stats.name, value FROM accountStats INNER JOIN stats ON stats.id = accountStats.statId INNER JOIN accounts ON accountStats.accountId = accounts.id WHERE accounts.uuid = ?;"; private static String RETRIEVE_STATS = "SELECT id, name FROM stats;"; private static String INSERT_STAT = "INSERT INTO stats (name) VALUES (?);"; @@ -81,10 +74,9 @@ public class StatsRepository extends RepositoryBase executeUpdate(INSERT_STAT, new ColumnVarChar("name", 100, name)); } + @SuppressWarnings("rawtypes") public void saveStats(NautHashMap> uploadQueue) { - System.out.println("saving stats."); - try { DSLContext context = DSL.using(getConnection()); @@ -96,8 +88,6 @@ public class StatsRepository extends RepositoryBase { for (Integer statId : uploadQueue.get(uuid).keySet()) { - System.out.println("saving stat : uuid=" + uuid + " " + statId + "=" + uploadQueue.get(uuid).get(statId)); - Update update = context .update(Tables.accountStats) .set(Tables.accountStats.value, Tables.accountStats.value.plus(uploadQueue.get(uuid).get(statId))) @@ -166,20 +156,14 @@ public class StatsRepository extends RepositoryBase return playerStats; } - public PlayerStats loadClientInformation(String uuid) + public PlayerStats loadClientInformation(ResultSet resultSet) throws SQLException { final PlayerStats playerStats = new PlayerStats(); - executeQuery(RETRIEVE_PLAYER_STATS, new ResultSetCallable() + while (resultSet.next()) { - public void processResultSet(ResultSet resultSet) throws SQLException - { - while (resultSet.next()) - { - playerStats.addStat(resultSet.getString(1), resultSet.getInt(2)); - } - } - }, new ColumnVarChar("uuid", 100, uuid)); + playerStats.addStat(resultSet.getString(1), resultSet.getInt(2)); + } return playerStats; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java b/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java index 9dbd1a505..297409df4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java @@ -7,7 +7,6 @@ import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.MiniClientPlugin; import mineplex.core.account.event.ClientWebResponseEvent; -import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.task.repository.TaskRepository; import mineplex.core.task.repository.TaskToken; @@ -52,9 +51,4 @@ public class TaskManager extends MiniClientPlugin _repository.AddTask(client.Name, taskName); } - - @Override - protected void loadClientInformation(RetrieveClientInformationEvent event) - { - } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java index 4dc18489f..46099fb23 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java @@ -14,12 +14,13 @@ import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_7_R4.util.CraftMagicNumbers; import org.bukkit.entity.Player; -import net.minecraft.server.v1_7_R4.PacketPlayOutBlockAction; +import net.minecraft.server.v1_7_R4.PacketPlayOutBlockAction; import mineplex.core.blockrestore.BlockRestore; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilParticle; +import mineplex.core.hologram.HologramManager; import mineplex.core.reward.Reward; import mineplex.core.reward.RewardData; import mineplex.core.reward.RewardRarity; @@ -56,15 +57,16 @@ public class Treasure private LinkedList _animations; private TreasureStyle _style; + private HologramManager _hologramManager; - public Treasure(Player player, Reward[] rewards, BlockRestore blockRestore) + public Treasure(Player player, Reward[] rewards, BlockRestore blockRestore, HologramManager hologramManager) { - this(player, new Random(), rewards); + this(player, new Random(), rewards, hologramManager); _blockRestore = blockRestore; } - public Treasure(Player player, Random seed, Reward[] rewards) + public Treasure(Player player, Random seed, Reward[] rewards, HologramManager hologramManager) { _player = player; _random = seed; @@ -73,6 +75,7 @@ public class Treasure _centerBlock = player.getLocation().getBlock().getRelative(BlockFace.DOWN); _animations = new LinkedList(); + _hologramManager = hologramManager; // _animations.add(new ParticleAnimation(this)); @@ -288,7 +291,7 @@ public class Treasure RewardData rewardData = data.getReward().giveReward("Treasure", _player); data.setOpened(true); - ChestOpenAnimation chestOpenTask = new ChestOpenAnimation(this, data, rewardData); + ChestOpenAnimation chestOpenTask = new ChestOpenAnimation(this, data, rewardData, _hologramManager); _animations.add(chestOpenTask); // Extra effects based off the rarity of the treasure diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java index dc6e8fe24..958deba89 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java @@ -36,6 +36,7 @@ import mineplex.core.common.util.UtilPlayer; import mineplex.core.donation.DonationManager; import mineplex.core.event.StackerEvent; import mineplex.core.gadget.event.GadgetBlockEvent; +import mineplex.core.hologram.HologramManager; import mineplex.core.inventory.InventoryManager; import mineplex.core.pet.PetManager; import mineplex.core.reward.Reward; @@ -55,14 +56,16 @@ public class TreasureManager extends MiniPlugin private RewardManager _rewardManager; private InventoryManager _inventoryManager; private BlockRestore _blockRestore; + private HologramManager _hologramManager; - public TreasureManager(JavaPlugin plugin, DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, BlockRestore blockRestore) + public TreasureManager(JavaPlugin plugin, DonationManager donationManager, InventoryManager inventoryManager, PetManager petManager, BlockRestore blockRestore, HologramManager hologramManager) { super("Treasure", plugin); _playerTreasureMap = new NautHashMap(); _inventoryManager = inventoryManager; _blockRestore = blockRestore; + _hologramManager = hologramManager; _rewardManager = new RewardManager(donationManager, inventoryManager, petManager, 250, 500, 750, 1500, @@ -108,7 +111,7 @@ public class TreasureManager extends MiniPlugin Bukkit.broadcastMessage(F.main("Treasure", F.name(player.getName()) + " is opening a " + C.cGreen + "Treasure Chest")); Reward[] rewards = _rewardManager.getRewards(player, true); - Treasure treasure = new Treasure(player, rewards, _blockRestore); + Treasure treasure = new Treasure(player, rewards, _blockRestore, _hologramManager); _playerTreasureMap.put(player, treasure); Location teleportLocation = treasure.getPlayerBlock().getLocation().add(0.5, 0, 0.5); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestOpenAnimation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestOpenAnimation.java index c8bb075c0..ccd8f5bca 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestOpenAnimation.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestOpenAnimation.java @@ -1,5 +1,13 @@ package mineplex.core.treasure.animation; +import mineplex.core.common.util.UtilServer; +import mineplex.core.hologram.Hologram; +import mineplex.core.hologram.HologramManager; +import mineplex.core.reward.RewardData; +import mineplex.core.treasure.ChestData; +import mineplex.core.treasure.Treasure; +import net.minecraft.server.v1_7_R4.PacketPlayOutBlockAction; + import org.bukkit.Location; import org.bukkit.Sound; import org.bukkit.block.Block; @@ -8,64 +16,61 @@ import org.bukkit.craftbukkit.v1_7_R4.util.CraftMagicNumbers; import org.bukkit.entity.Item; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import net.minecraft.server.v1_7_R4.PacketPlayOutBlockAction; - -import mineplex.core.common.util.UtilServer; -import mineplex.core.hologram.Hologram; -import mineplex.core.reward.RewardData; -import mineplex.core.treasure.ChestData; -import mineplex.core.treasure.Treasure; /** * Created by Shaun on 8/29/2014. */ public class ChestOpenAnimation extends Animation { - private ChestData _chestData; - private RewardData _rewardData; + private ChestData _chestData; + private RewardData _rewardData; + private HologramManager _hologramManager; - private Item _itemEntity; - private Hologram _hologram; + private Item _itemEntity; + private Hologram _hologram; - public ChestOpenAnimation(Treasure treasure, ChestData chestData, RewardData rewardData) - { - super(treasure); - _chestData = chestData; - _rewardData = rewardData; + public ChestOpenAnimation(Treasure treasure, ChestData chestData, RewardData rewardData, HologramManager hologramManager) + { + super(treasure); + _hologramManager = hologramManager; + _chestData = chestData; + _rewardData = rewardData; - // Send chest open packet - Block block = chestData.getBlock(); - PacketPlayOutBlockAction packet = new PacketPlayOutBlockAction(block.getX(), block.getY(), block.getZ(), CraftMagicNumbers.getBlock(block), 1, 1); - for (Player other : UtilServer.getPlayers()) - { - ((CraftPlayer) other).getHandle().playerConnection.sendPacket(packet); - other.playSound(block.getLocation(), Sound.CHEST_OPEN, 1, 1); - } - } + // Send chest open packet + Block block = chestData.getBlock(); + PacketPlayOutBlockAction packet = new PacketPlayOutBlockAction(block.getX(), block.getY(), block.getZ(), + CraftMagicNumbers.getBlock(block), 1, 1); + for (Player other : UtilServer.getPlayers()) + { + ((CraftPlayer) other).getHandle().playerConnection.sendPacket(packet); + other.playSound(block.getLocation(), Sound.CHEST_OPEN, 1, 1); + } + } - @Override - protected void tick() - { - if (getTicks() == 5) - { - Location location = _chestData.getBlock().getLocation().add(0.5, 0.8, 0.5); - _itemEntity = location.getWorld().dropItem(location, _rewardData.getDisplayItem()); - _itemEntity.setVelocity(new Vector(0, 0, 0)); - _itemEntity.setPickupDelay(Integer.MAX_VALUE); - } - else if (getTicks() == 15) - { - _hologram = new Hologram(_chestData.getBlock().getLocation().add(0.5, 1.1, 0.5), _rewardData.getFriendlyName()); - _hologram.sendToPlayers(_chestData.getBlock().getLocation().getWorld().getPlayers().toArray(new Player[0])); - } - } + @Override + protected void tick() + { + if (getTicks() == 5) + { + Location location = _chestData.getBlock().getLocation().add(0.5, 0.8, 0.5); + _itemEntity = location.getWorld().dropItem(location, _rewardData.getDisplayItem()); + _itemEntity.setVelocity(new Vector(0, 0, 0)); + _itemEntity.setPickupDelay(Integer.MAX_VALUE); + } + else if (getTicks() == 15) + { + _hologram = new Hologram(_hologramManager, _chestData.getBlock().getLocation().add(0.5, 1.1, 0.5), + _rewardData.getFriendlyName()); + _hologram.start(); + } + } - public void onFinish() - { - if (_hologram != null) - { - _hologram.removeForPlayers(_chestData.getBlock().getLocation().getWorld().getPlayers().toArray(new Player[0])); - _itemEntity.remove(); - } - } + public void onFinish() + { + if (_hologram != null) + { + _hologram.stop(); + _itemEntity.remove(); + } + } } diff --git a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java index 19e735167..7c72fafc9 100644 --- a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java +++ b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java @@ -153,6 +153,12 @@ public class Enjin extends MiniPlugin implements CommandExecutor playerUUID = UUIDFetcher.getUUIDOf(name); } + if (playerUUID == null) + { + System.out.println("[" + _dateFormat.format(new Date()) + "] ERROR processing " + name + ", no UUID."); + return true; + } + _cachedUUIDs.put(name, new AbstractMap.SimpleEntry(playerUUID, System.currentTimeMillis() + 240000)); if (args.length == 3 && args[0].equalsIgnoreCase("gem")) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java index f14afd7ca..80734685e 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java @@ -37,6 +37,7 @@ public class ClanInfo } } + private int _id = -1; private String _name = ""; private String _desc = ""; private Location _home = null; @@ -64,6 +65,7 @@ public class ClanInfo { Clans = clans; + _id = token.Id; _name = token.Name; _desc = token.Description; @@ -370,4 +372,9 @@ public class ClanInfo { return _admin; } + + public int getId() + { + return _id; + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java new file mode 100644 index 000000000..80f15905c --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java @@ -0,0 +1,695 @@ +package mineplex.game.clans.clans; + +import java.util.ArrayList; + +import mineplex.core.account.CoreClient; +import mineplex.core.common.Rank; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilInput; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; +import mineplex.core.common.util.UtilWorld; +import mineplex.game.clans.clans.ClanInfo.Role; +import mineplex.game.clans.clans.repository.ClanTerritory; + +import org.bukkit.entity.Player; + +public class ClansAdmin +{ + private ClansManager Clans; + + public ClansAdmin(ClansManager clans) + { + Clans = clans; + } + + public void command(Player caller, String[] args) + { + if (args.length == 1) + help(caller); + + else if (args[1].equalsIgnoreCase("help") || args[1].equalsIgnoreCase("h")) + help(caller); + + else if (args[1].equalsIgnoreCase("set") || args[1].equalsIgnoreCase("mimic")) + setMimic(caller, args); + + else if (args[1].equalsIgnoreCase("create")) + create(caller, args); + + else if (args[1].equalsIgnoreCase("disband") || args[1].equalsIgnoreCase("delete") || args[1].equalsIgnoreCase("d")) + delete(caller, args); + + else if (args[1].equalsIgnoreCase("invite") || args[1].equalsIgnoreCase("i")) + invite(caller, args); + + else if (args[1].equalsIgnoreCase("promote")) + promote(caller, args); + + else if (args[1].equalsIgnoreCase("demote")) + demote(caller, args); + + else if (args[1].equalsIgnoreCase("kick") || args[1].equalsIgnoreCase("k")) + kick(caller, args); + + else if (args[1].equalsIgnoreCase("ally") || args[1].equalsIgnoreCase("a")) + ally(caller, args); + + else if (args[1].equalsIgnoreCase("trust")) + trust(caller, args); + + else if (args[0].equalsIgnoreCase("neutral") || args[0].equalsIgnoreCase("neut") || args[0].equalsIgnoreCase("n")) + neutral(caller, args); + + else if (args[1].equalsIgnoreCase("claim") || args[1].equalsIgnoreCase("c")) + claim(caller); + + else if (args[1].equalsIgnoreCase("unclaim") || args[1].equalsIgnoreCase("uc")) + unclaim(caller, args); + + else if (args[1].equalsIgnoreCase("home") || args[1].equalsIgnoreCase("h")) + home(caller, args); + + else if (args[1].equalsIgnoreCase("safe")) + safe(caller); + + else if (args[1].equalsIgnoreCase("autoclaim")) + autoclaim(caller); + + else + help(caller); + } + + private void help(Player caller) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Admin Commands List;")); + + UtilPlayer.message(caller, F.help("/c x create ", "Create Admin Clan", Rank.ADMIN)); + + UtilPlayer.message(caller, F.help("/c x set ", "Set Mimic Clan", Rank.ALL)); + + UtilPlayer.message(caller, F.help("/c x home (set)", "Teleport to Mimic Home", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x invite ", "Invite Player to Mimic", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x promote ", "Promote Player in Mimic", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x demote ", "Demote Player in Mimic", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x kick ", "Kick Player from Mimic", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x ally ", "Send Alliance to Mimic", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x trust ", "Give Trust to Clan", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x neutral ", "Set Neutrality", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x enemy ", "Start Invasion", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x claim", "Claim Territory for Mimic", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x unclaim (all)", "Unclaim Territory for Mimic", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x delete", "Delete Mimic Clan", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/c x autoclaim", "AutoClaim for Mimic Clan", Rank.ADMIN)); + UtilPlayer.message(caller, F.main("Mimic Clan", Clans.Get(caller).getMimic())); + } + + private void autoclaim(Player caller) + { + Clans.Get(caller).setAutoClaim(!Clans.Get(caller).isAutoClaim()); + + UtilPlayer.message(caller, F.main("Clans Admin", F.oo("Auto Claim", Clans.Get(caller).isAutoClaim()))); + } + + public void setMimic(Player caller, String[] args) + { + if (args.length < 3) + { + if (Clans.Get(caller).getMimic().length() > 0) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You are no longer mimicing " + F.elem("Clan " + Clans.Get(caller).getMimic()) + ".")); + Clans.Get(caller).setMimic(""); + } + else + UtilPlayer.message(caller, F.main("Clans Admin", "You did not input a Clan/Player.")); + + return; + } + + ClanInfo clan = Clans.getClanUtility().searchClanPlayer(caller, args[2], true); + + if (clan == null) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Invalid Clan/Player.")); + return; + } + + //Set Mimic + Clans.Get(caller).setMimic(clan.getName()); + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You are mimicing " + F.elem("Clan " + clan.getName()) + ".")); + } + + public ClanInfo getMimic(Player caller, boolean inform) + { + String mimic = Clans.Get(caller).getMimic(); + + if (mimic.length() == 0) + return null; + + ClanInfo clan = Clans.getClanUtility().searchClanPlayer(caller, mimic, true); + + if (clan == null) + { + if (inform) + UtilPlayer.message(caller, F.main("Clans Admin", "You are not mimicing a Clan.")); + + return null; + } + + return clan; + } + + public void create(Player caller, String[] args) + { + if (args.length < 3) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You did not input a Clan name.")); + return; + } + + if (!UtilInput.valid(args[2])) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Invalid characters in Clan name.")); + return; + } + + if (args[2].length() < Clans.getNameMin()) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Clan name too short. Minimum length is " + (Clans.getNameMin()) + ".")); + return; + } + + if (args[2].length() > Clans.getNameMax()) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Clan name too long. Maximum length is + " + (Clans.getNameMax()) + ".")); + return; + } + + for (String cur : Clans.CCommand().denyClan) + { + if (cur.equalsIgnoreCase(args[2])) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Clan name cannot be a Clan command.")); + return; + } + } + + for (String cur : Clans.getAll()) + { + if (cur.equalsIgnoreCase(args[2])) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Clan name cannot be a Player name.")); + return; + } + } + + if (Clans.getClan(args[2]) != null) + { + UtilPlayer.message(caller, F.main("Clans Admin", F.elem("Clan " + args[2]) + " already exists.")); + return; + } + + //Inform + UtilServer.broadcast(F.main("Clans Admin", caller.getName() + " formed " + F.elem("Admin Clan " + args[2]) + ".")); + + // Create and Join + Clans.getClanDataAccess().create(caller.getName(), args[2], true); + + // Set Mimic + Clans.Get(caller).setMimic(args[2]); + + // Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You are mimicing Clan " + args[2] + ".")); + } + + public void delete(Player caller, String[] args) + { + ClanInfo clan = getMimic(caller, true); + + if (clan == null) + return; + + //Task + Clans.getClanDataAccess().delete(clan); + + //Inform + UtilServer.broadcast(F.main("Clans Admin", caller.getName() + " disbanded " + F.elem("Clan " + clan.getName()) + ".")); + } + + public void invite(Player caller, String[] args) + { + ClanInfo clan = getMimic(caller, true); + + if (clan == null) + return; + + if (args.length < 3) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You did not input an invitee.")); + return; + } + + Player target = UtilPlayer.searchOnline(caller, args[2], true); + if (target == null) + return; + + if (target.getName().equals(caller.getName())) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You cannot invite yourself.")); + return; + } + + //Inform + clan.inform(caller.getName() + " invited " + target.getName() + " to join Clan " + clan.getName() + ".", caller.getName()); + UtilPlayer.message(caller, F.main("Clans Admin", "You invited " + target.getName() + " to join " + F.elem("Clan " + clan.getName()) + ".")); + UtilPlayer.message(target, F.main("Clans Admin", caller.getName() + " invited you to join " + F.elem("Clan " + clan.getName()) + ".")); + + //Task + Clans.getClanDataAccess().invite(clan, target.getName(), caller.getName()); + } + + public void promote(Player caller, String[] args) + { + ClanInfo clan = getMimic(caller, true); + + if (clan == null) + return; + + if (args.length < 3) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You did not input player to promote.")); + return; + } + + String target = UtilPlayer.searchCollection(caller, args[2], clan.getMembers().keySet(), "Clan Member", true); + + if (target == null) + return; + + if (clan.getMembers().get(target) == Role.LEADER) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You cannot promote " + F.name(target) + " any further.")); + return; + } + + //Task + String newRank = "?"; + if (clan.getMembers().get(target) == Role.RECRUIT) + { + Clans.getClanDataAccess().role(clan, target, Role.MEMBER); + newRank = "Member"; + } + else if (clan.getMembers().get(target) == Role.MEMBER) + { + Clans.getClanDataAccess().role(clan, target, Role.ADMIN); + newRank = "Admin"; + } + else if (clan.getMembers().get(target) == Role.ADMIN) + { + Clans.getClanDataAccess().role(clan, target, Role.LEADER); + newRank = "Leader"; + } + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You promoted " + target + " to " + newRank + " in Mimic Clan.")); + clan.inform(caller.getName() + " promoted " + target + " to " + newRank + ".", null); + } + + public void demote(Player caller, String[] args) + { + ClanInfo clan = getMimic(caller, true); + + if (clan == null) + return; + + if (args.length < 3) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You did not input player to demote.")); + return; + } + + String target = UtilPlayer.searchCollection(caller, args[2], clan.getMembers().keySet(), "Clan Member", true); + if (target == null) + return; + + if (clan.getMembers().get(target) == Role.RECRUIT) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You cannot demote " + F.name(target) + " any further.")); + return; + } + + //Task + String newRank = "?"; + if (clan.getMembers().get(target) == Role.MEMBER) + { + Clans.getClanDataAccess().role(clan, target, Role.RECRUIT); + newRank = "Recruit"; + } + else if (clan.getMembers().get(target) == Role.ADMIN) + { + Clans.getClanDataAccess().role(clan, target, Role.MEMBER); + newRank = "Member"; + } + else if (clan.getMembers().get(target) == Role.LEADER) + { + Clans.getClanDataAccess().role(clan, target, Role.ADMIN); + newRank = "Admin"; + } + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You demoted " + target + " to " + newRank + " in Mimic Clan.")); + clan.inform(F.main("Clans Admin", caller.getName() + " demoted " + target + " to " + newRank + "."), null); + } + + public void kick(Player caller, String[] args) + { + ClanInfo clan = getMimic(caller, true); + + if (clan == null) + return; + + if (args.length < 3) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You did not input a Player to kick.")); + return; + } + + String targetName = UtilPlayer.searchCollection(caller, args[2], clan.getMembers().keySet(), "Clan Member", true); + + if (targetName == null) + return; + + //Task + Clans.getClanDataAccess().leave(clan, targetName); + + //Inform + UtilPlayer.message(UtilPlayer.searchOnline(null, targetName, false), F.main("Clans Admin", caller.getName() + " kicked you from " + F.elem("Clan " + clan.getName()) + ".")); + UtilPlayer.message(caller, F.main("Clans Admin", "You kicked " + targetName + " from your Clan.")); + clan.inform(F.main("Clans Admin", caller.getName() + " kicked " + targetName + " from your Clan."), caller.getName()); + } + + public void ally(Player caller, String[] args) + { + ClanInfo cA = getMimic(caller, true); + + if (cA == null) + return; + + if (args.length < 3) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You did not input a Clan to ally.")); + return; + } + + ClanInfo cB = Clans.getClanUtility().searchClanPlayer(caller, args[2], true); + + if (cB == null) + return; + + if (cA.isSelf(cB.getName())) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You cannot ally with yourself.")); + return; + } + + if (cA.isAlly(cB.getName())) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You are already allies with " + F.elem("Clan " + cB.getName()) + ".")); + return; + } + + if (cB.isRequested(cA.getName())) + { + //Task + Clans.getClanDataAccess().ally(cA, cB, caller.getName()); + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You accepted alliance with Clan " + cB.getName() + ".")); + cA.inform(caller.getName() + " accepted alliance with Clan " + cB.getName() + ".", caller.getName()); + cB.inform("Clan " + cA.getName() + " has accepted alliance with you.", null); + } + else + { + //Task + Clans.getClanDataAccess().requestAlly(cA, cB, caller.getName()); + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You requested alliance with Clan " + cB.getName() + ".")); + cA.inform(caller.getName() + " has requested alliance with Clan " + cB.getName() + ".", caller.getName()); + cB.inform("Clan " + cA.getName() + " has requested alliance with you.", null); + } + } + + public void trust(Player caller, String[] args) + { + ClanInfo cA = getMimic(caller, true); + + if (cA == null) + return; + + if (args.length < 3) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You did not input a Clan to enemy.")); + return; + } + + ClanInfo cB = Clans.getClanUtility().searchClanPlayer(caller, args[2], true); + + if (cB == null) + return; + + if (!cA.isAlly(cB.getName())) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You cannot give trust to enemies.")); + return; + } + + //Task + if (Clans.getClanDataAccess().trust(cA, cB, caller.getName())) + { + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You gave trust to Clan " + cB.getName() + ".")); + cA.inform(caller.getName() + " has given trust to Clan " + cB.getName() + ".", caller.getName()); + cB.inform("Clan " + cA.getName() + " has given trust to you.", null); + } + else + { + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You revoked trust to Clan " + cB.getName() + ".")); + cA.inform(caller.getName() + " has revoked trust to Clan " + cB.getName() + ".", caller.getName()); + cB.inform("Clan " + cA.getName() + " has revoked trust to you.", null); + } + } + + public void neutral(Player caller, String[] args) + { + ClanInfo cA = getMimic(caller, true); + + if (cA == null) + return; + + if (args.length < 2) + { + UtilPlayer.message(caller, F.main("Clans", "You did not input a Clan to set neutrality with.")); + return; + } + + ClanInfo cB = Clans.getClanUtility().searchClanPlayer(caller, args[1], true); + + if (cB == null) + return; + + if (cB.isSelf(cA.getName())) + { + UtilPlayer.message(caller, F.main("Clans", "You prefer to think of yourself positively...")); + return; + } + + if (cB.isNeutral(cA.getName())) + { + UtilPlayer.message(caller, F.main("Clans", "You are already neutral with " + F.elem("Clan " + cB.getName()) + ".")); + return; + } + + if (cB.isAlly(cA.getName())) + { + //Task + Clans.getClanDataAccess().neutral(cA, cB, caller.getName(), true); + + //Inform + UtilPlayer.message(caller, F.main("Clans", "You revoked alliance with " + F.elem("Clan " + cB.getName()) + ".")); + cA.inform(F.name(caller.getName()) + " revoked alliance with " + F.elem("Clan " + cB.getName()) + ".", caller.getName()); + cB.inform(F.elem("Clan " + cA.getName()) + " has revoked alliance with you.", null); + + return; + } + } + + public void claim(Player caller) + { + ClanInfo clientClan = getMimic(caller, true); + + if (clientClan == null) + return; + + if (clientClan.getClaims() >= clientClan.getClaimsMax()) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Your Clan cannot claim more Territory.")); + return; + } + + String chunk = UtilWorld.chunkToStr(caller.getLocation().getChunk()); + ClanInfo ownerClan = Clans.getClanUtility().getOwner(caller.getLocation()); + + //Already Claimed + if (ownerClan != null) + { + UtilPlayer.message(caller, F.main("Clans Admin", "This Territory is claimed by " + + Clans.getClanUtility().mRel(Clans.getClanUtility().relPC(caller.getName(), ownerClan), ownerClan.getName(), true) + ".")); + return; + } + + //Task + Clans.getClanDataAccess().claim(clientClan.getName(), chunk, caller.getName(), false); + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You claimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".")); + clientClan.inform(caller.getName() + " claimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".", caller.getName()); + } + + public void unclaim(Player caller, String args[]) + { + if (args.length > 2) + { + if (args[2].equalsIgnoreCase("all") || args[2].equalsIgnoreCase("a")) + { + unclaimall(caller); + return; + } + } + + ClanInfo clientClan = getMimic(caller, true); + + if (clientClan == null) + return; + + String chunk = UtilWorld.chunkToStr(caller.getLocation().getChunk()); + ClanInfo ownerClan = Clans.getClanUtility().getOwner(caller.getLocation()); + + //Not Claimed + if (ownerClan == null) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Territory is not claimed.")); + return; + } + + //Task + Clans.getClanDataAccess().unclaim(chunk, caller.getName(), true); + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You unclaimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".")); + ownerClan.inform(caller.getName() + " unclaimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".", caller.getName()); + } + + public void unclaimall(Player caller) + { + ClanInfo clientClan = getMimic(caller, true); + + if (clientClan == null) + return; + + //Unclaim + ArrayList toUnclaim = new ArrayList(); + + for (String chunk : clientClan.getClaimSet()) + toUnclaim.add(chunk); + + for (String chunk : toUnclaim) + Clans.getClanDataAccess().unclaim(chunk, caller.getName(), true); + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You unclaimed all your Clans Territory.")); + clientClan.inform(caller.getName() + " unclaimed all your Clans Territory.", caller.getName()); + } + + public void home(Player caller, String[] args) + { + if (args.length > 2) + { + if (args[2].equalsIgnoreCase("set") || args[2].equalsIgnoreCase("s")) + { + homeSet(caller); + return; + } + } + + ClanInfo clan = getMimic(caller, true); + + if (clan == null) + return; + + if (clan.getHome() == null) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Your Clan has not set a Home.")); + return; + } + + if (!clan.getClaimSet().contains(UtilWorld.chunkToStr(clan.getHome().getChunk()))) + { + UtilPlayer.message(caller, F.main("Clans Admin", "Your Clan has lost its Home Territory.")); + return; + } + + //Do + Clans.getTeleport().TP(caller, clan.getHome()); + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You teleported to your Clan Home " + UtilWorld.locToStrClean(caller.getLocation()) + ".")); + } + + public void homeSet(Player caller) + { + ClanInfo clan = getMimic(caller, true); + + if (clan == null) + return; + + if (Clans.getClanUtility().getOwner(caller.getLocation()) == null) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You must set your Clan Home in your own Territory.")); + return; + } + + if (!Clans.getClanUtility().getOwner(caller.getLocation()).isSelf(clan.getName())) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You must set your Clan Home in your own Territory.")); + return; + } + + //Task + Clans.getClanDataAccess().home(clan, caller.getLocation(), caller.getName()); + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "You set Clan Home to " + UtilWorld.locToStrClean(caller.getLocation()) + ".")); + clan.inform(caller.getName() + " set Clan Home to " + UtilWorld.locToStrClean(caller.getLocation()) + ".", caller.getName()); + } + + public void safe(Player caller) + { + ClanTerritory claim = Clans.getClanUtility().getClaim(caller.getLocation()); + + if (claim == null) + { + UtilPlayer.message(caller, F.main("Clans Admin", "You can only Safe Zone on Claimed Territory.")); + return; + } + + //Set + Clans.getClanDataAccess().safe(claim, caller.getName()); + + //Inform + UtilPlayer.message(caller, F.main("Clans Admin", "Territory Safe Zone: " + F.tf(claim.Safe))); + } +} diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java index cb93e8ea5..3673bc6a8 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java @@ -7,7 +7,6 @@ import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import mineplex.core.account.CoreClient; import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilWorld; import mineplex.game.clans.clans.ClanInfo.Role; @@ -92,7 +91,7 @@ public class ClansDataAccessLayer clan.getInviterMap().remove(player); //Save - _repository.addMember(clan.getName(), player); + _repository.addMember(clan.getId(), player, role.toString()); //Log _manager.log("Added [" + player + "] to [" + clan.getName() + "]."); @@ -108,7 +107,7 @@ public class ClansDataAccessLayer _manager.getClanMemberMap().remove(player); //Save - _repository.removeMember(clan.getName(), player); + _repository.removeMember(clan.getId(), player); //Log _manager.log("Removed [" + player + "] from [" + clan.getName() + "]."); @@ -120,7 +119,7 @@ public class ClansDataAccessLayer clan.getMembers().put(player, role); //Save - _repository.updateMember(clan.getName(), player, role); + _repository.updateMember(clan.getId(), player, role.toString()); //Log _manager.log("Removed [" + player + "] from [" + clan.getName() + "]."); @@ -154,8 +153,8 @@ public class ClansDataAccessLayer cB.getAllyMap().put(cA.getName(), false); //Save - _manager.CRepo().EditClan(cA.GetToken()); - _manager.CRepo().EditClan(cB.GetToken()); + _repository.addClanRelationship(cA.getId(), cB.getId(), true); + _repository.addClanRelationship(cB.getId(), cA.getId(), true); //Log _manager.log("Added Ally for [" + cB.getName() + "] and [" + cA.getName() + "] by [" + player + "]."); @@ -172,16 +171,8 @@ public class ClansDataAccessLayer cA.getAllyMap().put(cB.getName(), trust); //Save - _manager.CRepo().EditClan(cA.GetToken()); - _manager.CRepo().EditClan(cB.GetToken()); - - //Update Relations - for (String cur : cA.getMembers().keySet()) - _manager.getClanUtility().updateRelations(cur); - - //Update Relations - for (String cur : cB.getMembers().keySet()) - _manager.getClanUtility().updateRelations(cur); + _repository.updateClanRelationship(cA.getId(), cB.getId(), true); + _repository.updateClanRelationship(cB.getId(), cA.getId(), true); //Log _manager.log("Gave Trust [" + trust + "] to [" + cB.getName() + "] for [" + cA.getName() + "] by [" + player + "]."); @@ -196,21 +187,14 @@ public class ClansDataAccessLayer cB.getAllyMap().remove(cA.getName()); //Save - _manager.CRepo().EditClan(cA.GetToken()); - _manager.CRepo().EditClan(cB.GetToken()); - - //Update Relations - for (String cur : cA.getMembers().keySet()) - _manager.getClanUtility().updateRelations(cur); - - //Update Relations - for (String cur : cB.getMembers().keySet()) - _manager.getClanUtility().updateRelations(cur); + _repository.removeClanRelationship(cA.getId(), cB.getId()); + _repository.removeClanRelationship(cB.getId(), cA.getId()); //Log _manager.log("Added Neutral between [" + cA.getName() + "] and [" + cB.getName() + "] by [" + player + "]."); } + @SuppressWarnings("deprecation") public boolean claim(String name, String chunk, String player, boolean safe) { if (!_manager.getClanMap().containsKey(name)) @@ -223,16 +207,18 @@ public class ClansDataAccessLayer unclaim(chunk, player, false); //Memory - ClanTerritory claim = new ClanTerritory(_manager, name, chunk, safe); + ClanTerritory claim = new ClanTerritory(); + claim.Owner = name; + claim.Safe = safe; clan.getClaimSet().add(chunk); _manager.getClaimMap().put(chunk, claim); //Save - _manager.CRepo().EditClan(clan.GetToken()); + _repository.addTerritoryClaim(clan.getId(), chunk, safe); //Visual Chunk c = UtilWorld.strToChunk(chunk); - if (!clan.IsAdmin()) + if (!clan.isAdmin()) for (int i = 0 ; i < 3 ; i++) for (int x=0 ; x < 16 ; x++) for (int z=0 ; z < 16 ; z++) @@ -241,7 +227,7 @@ public class ClansDataAccessLayer Block down = UtilBlock.getHighest(c.getWorld(), c.getBlock(x, 0, z).getX(), c.getBlock(x, 0, z).getZ()).getRelative(BlockFace.DOWN); if (down.getTypeId() == 1 || down.getTypeId() == 2 || down.getTypeId() == 3 || down.getTypeId() == 12 || down.getTypeId() == 8) - _manager.BlockRestore().Add(down, 89, (byte)0, 180000); + _manager.getBlockRestore().Add(down, 89, (byte)0, 180000); } //Log @@ -272,10 +258,10 @@ public class ClansDataAccessLayer clan.getClaimSet().remove(chunk); //Save - _manager.CRepo().EditClan(clan.GetToken()); + _repository.removeTerritoryClaim(clan.getId(), chunk); //Register - _manager.getUnclaimMap().put(chunk, System.currentTimeMillis()); + // _manager.getUnclaimMap().put(chunk, System.currentTimeMillis()); //Log _manager.log("Removed Claim for [" + clan.getName() + "] at [" + chunk + "] by [" + player + "]."); @@ -286,10 +272,10 @@ public class ClansDataAccessLayer public void home(ClanInfo clan, Location loc, String player) { //Memory - clan.SetHome(loc); + clan.setHome(loc); //Save - _manager.CRepo().EditClan(clan.GetToken()); + _repository.updateClan(clan.getId(), clan.getName(), clan.getDesc(), UtilWorld.locToStr(clan.getHome()), clan.isAdmin(), clan.getLastOnline()); //Log _manager.log("Set Home for [" + clan.getName() + "] to " + UtilWorld.locToStrClean(loc) + " by [" + player + "]."); @@ -301,9 +287,9 @@ public class ClansDataAccessLayer claim.Safe = !claim.Safe; //Save - _manager.CRepo().EditClan(_manager.getClan(claim.Owner).GetToken()); + _repository.updateTerritoryClaim(claim.Chunk, claim.Safe); //Log - _manager.log("Safe Zone at [" + claim.chunk + "] set to [" + claim.Safe + "] by [" + player + "]."); + _manager.log("Safe Zone at [" + claim.Chunk + "] set to [" + claim.Safe + "] by [" + player + "]."); } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDisplay.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDisplay.java new file mode 100644 index 000000000..715445088 --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDisplay.java @@ -0,0 +1,251 @@ +package mineplex.game.clans.clans; + +import java.util.LinkedList; + +import mineplex.core.common.util.C; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; +import mineplex.core.common.util.UtilWorld; +import mineplex.core.recharge.Recharge; +import mineplex.game.clans.clans.ClansUtility.ClanRelation; +import mineplex.game.clans.clans.repository.ClanTerritory; + +import org.bukkit.Chunk; +import org.bukkit.Material; +import org.bukkit.World.Environment; +import org.bukkit.entity.Player; +import org.bukkit.event.player.PlayerInteractEvent; + +public class ClansDisplay +{ + private ClansManager Clans; + + public ClansDisplay(ClansManager clans) + { + Clans = clans; + } + + public void Update(Player player) + { + if (player.getWorld().getEnvironment() != Environment.NORMAL) + return; + + ClientClan client = Clans.Get(player); + if (client == null) return; + + //Same Chunk + if (client.getTerritory().equals(UtilWorld.chunkToStr(player.getLocation().getChunk()))) + return; + + //Update Territory + client.setTerritory(UtilWorld.chunkToStr(player.getLocation().getChunk())); + + //AutoClaim + if (client.isAutoClaim()) + Clans.getClanAdmin().claim(player); + + //Map + String owner = "?"; + ClanInfo ownerClan = Clans.getClanUtility().getOwner(player.getLocation()); + if (ownerClan != null) + owner = ownerClan.getName(); + + boolean safe = Clans.getClanUtility().isSafe(player); + + if (!client.isMapOn()) + { + boolean showChange = false; + + //Owner Change + if (!client.getOwner().equals(owner)) + { + client.setOwner(owner); + showChange = true; + } + + //Safe Change + if (safe != client.isSafe()) + { + client.setSafe(safe); + showChange = true; + } + + if (showChange) + displayOwner(player); + } + else + { + displayOwner(player); + displayMap(player); + } + } + + public void displayOwner(Player player) + { + //Name + String ownerString = C.xWilderness + "Wilderness"; + + ClanTerritory claim = Clans.getClanUtility().getClaim(player.getLocation()); + String append = ""; + if (claim != null) + { + //Relation + ClanRelation relation = Clans.getClanUtility().relPT(player.getName(), claim.Chunk); + + //Name + ownerString = Clans.getClanUtility().mRel(relation, claim.Owner, false); + + //Trust + if (relation == ClanRelation.ALLY_TRUST) + append = C.mBody + "(" + C.mElem + "Trusted" + C.mBody + ")"; + } + + UtilPlayer.message(player, F.main("Clans", ownerString + " " + append)); + } + + public int width = 8; + public int height = 4; + + public void displayMap(Player player) + { + if (player.getWorld().getEnvironment().equals(Environment.NETHER)) + return; + + //Get Local + LinkedList local = mLocalMap(player, player.getLocation().getChunk(), true); + + //Get Home + LinkedList home = null; + + if (player.getItemInHand().getType() == Material.MAP) + { + ClanInfo clan = Clans.getClanUtility().getClanByPlayer(player); + if (clan != null) + if (clan.getHome() != null) + home = mLocalMap(player, clan.getHome().getChunk(), false); + } + + //Display + if (home == null || local.size() != home.size()) + UtilPlayer.message(player, local); + + else + for (int i = 0 ; i < local.size() ; i++) + UtilPlayer.message(player, local.get(i) + " " + home.get(i)); + } + + public LinkedList mLocalMap(Player player, Chunk chunk, boolean local) + { + if (chunk == null) + return null; + + LinkedList localMap = new LinkedList(); + + for (int i=(chunk.getX()-height) ; i <= (chunk.getX()+height) ; i++) + { + String output = C.xNone + "<"; + + for (int j=(chunk.getZ()+width) ; j >= (chunk.getZ()-width) ; j--) + { + Chunk curChunk = player.getWorld().getChunkAt(i, j); + + //Count Players + int pCount = 0; + if (player.getItemInHand().getType() == Material.MAP) + { + for (Player cur : UtilServer.getPlayers()) + if (cur.getLocation().getChunk().toString().equals(curChunk.toString())) + pCount++; + } + + //Get Data + ClanInfo curOwner = Clans.getClanUtility().getOwner(UtilWorld.chunkToStr(curChunk)); + ClanTerritory curClaim = Clans.getClanUtility().getClaim(UtilWorld.chunkToStr(curChunk)); + + //Add Icon + if (i == chunk.getX() && j == chunk.getZ()) + output += getMapIcon(Clans.getClanUtility().relPC(player.getName(), curOwner), curClaim, curOwner, curChunk, pCount, true, local); + else + output += getMapIcon(Clans.getClanUtility().relPC(player.getName(), curOwner), curClaim, curOwner, curChunk, pCount, false, local); + } + + output += ">"; + + //Send + localMap.add(output); + } + + return localMap; + } + + public String getMapIcon(ClanRelation relation, ClanTerritory claim, ClanInfo owner, Chunk chunk, int players, boolean mid, boolean local) + { + if (players > 9) + players = 9; + + if (mid && local) + { + if (players > 0) return "" + C.cWhite + players; + else return "" + C.cWhite + "X"; + } + + if (owner == null || claim == null) + { + if (players > 0) return "" + C.xNone + players; + else return "" + C.xNone + "-"; + } + + if (claim.Safe) + { + if (players > 0) return "" + C.xSafe + players; + else return "" + C.xSafe + "S"; + } + + if (owner.isAdmin()) + { + if (players > 0) return "" + C.xAdmin + players; + else return "" + C.xAdmin + "+"; + } + + + if (relation == ClanRelation.SELF) + { + if (players > 0) return "" + C.xSelf + players; + else if (Clans.getClanUtility().isChunkHome(owner, chunk)) return "" + C.xSelf + "H"; + else return "" + C.xSelf + "#"; + } + + if (relation == ClanRelation.ALLY) + { + if (players > 0) return "" + C.xAlly + players; + else if (Clans.getClanUtility().isChunkHome(owner, chunk)) return "" + C.xAlly + "H"; + else return "" + C.xAlly + "#"; + } + + if (relation == ClanRelation.ALLY_TRUST) + { + if (players > 0) return "" + C.xdAlly + players; + else if (Clans.getClanUtility().isChunkHome(owner, chunk)) return "" + C.xdAlly + "H"; + else return "" + C.xdAlly + "#"; + } + + if (players > 0) return "" + C.xEnemy + players; + else if (Clans.getClanUtility().isChunkHome(owner, chunk)) return "" + C.xEnemy + "H"; + else return "" + C.xEnemy + "#"; + } + + public void handleInteract(PlayerInteractEvent event) + { + if (event.getPlayer().getItemInHand().getType() != Material.MAP) + return; + + if (!Recharge.Instance.use(event.getPlayer(), "Clan Map", 500, false, false)) + return; + + displayOwner(event.getPlayer()); + displayMap(event.getPlayer()); + } + + +} diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index 68a316c0e..abc44c840 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -24,6 +24,7 @@ import mineplex.core.MiniClientPlugin; import mineplex.core.MiniPlugin; import mineplex.core.account.CoreClient; import mineplex.core.account.event.RetrieveClientInformationEvent; +import mineplex.core.blockrestore.BlockRestore; import mineplex.core.common.Rank; import mineplex.core.common.util.F; import mineplex.core.common.util.NautHashMap; @@ -33,8 +34,10 @@ import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilEvent.ActionType; import mineplex.core.common.util.UtilTime.TimeUnit; import mineplex.core.creature.event.CreatureSpawnCustomEvent; +import mineplex.core.teleport.Teleport; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; +import mineplex.game.clans.clans.ClansUtility.ClanRelation; import mineplex.game.clans.clans.repository.ClanTerritory; import mineplex.minecraft.game.core.combat.CombatManager; import mineplex.minecraft.game.core.damage.CustomDamageEvent; @@ -43,6 +46,11 @@ public class ClansManager extends MiniClientPlugin { private CombatManager _combatManager; private ClansUtility _clanUtility; + private ClansDataAccessLayer _clanDataAccess; + private ClansDisplay _clanDisplay; + private ClansAdmin _clanAdmin; + private BlockRestore _blockRestore; + private Teleport _teleport; private int _dominanceLimit = 16; private int _inviteExpire = 2; @@ -57,12 +65,17 @@ public class ClansManager extends MiniClientPlugin private NautHashMap _claimMap = new NautHashMap(); private NautHashMap _unclaimMap = new NautHashMap(); - public ClansManager(JavaPlugin plugin, CombatManager combatManager) + public ClansManager(JavaPlugin plugin, CombatManager combatManager, BlockRestore blockRestore, Teleport teleport) { super("Clans Manager", plugin); _combatManager = combatManager; _clanUtility = new ClansUtility(this); + _blockRestore = blockRestore; + _teleport = teleport; + _clanDataAccess = new ClansDataAccessLayer(this); + _clanDisplay = new ClansDisplay(this); + _clanAdmin = new ClansAdmin(this); } public int getInviteExpire() @@ -111,17 +124,9 @@ public class ClansManager extends MiniClientPlugin CCommand().command(caller, args); } - public ClansClan getClan(String name) - { - return GetClanMap().get(name); - } - @EventHandler public void Update(UpdateEvent event) { - if (event.getType() == UpdateType.SEC) - Power(); - if (event.getType() == UpdateType.FAST) CGame().UpdateSafe(); @@ -177,7 +182,7 @@ public class ClansManager extends MiniClientPlugin @EventHandler(priority = EventPriority.HIGHEST) public void BlockCreatureSpawn(CreatureSpawnCustomEvent event) { - ClansClan clan = Clans().CUtil().getOwner(event.GetLocation()); + ClansClan clan = _clanUtility.getOwner(event.GetLocation()); if (clan != null) if (!clan.IsAdmin() && !clan.GetName().equals("Spawn")) @@ -256,18 +261,18 @@ public class ClansManager extends MiniClientPlugin public boolean HandleClanChat(AsyncPlayerChatEvent event, String filteredMessage) { - CoreClient client = Clients().Get(event.getPlayer()); + ClientClan client = Get(event.getPlayer()); if (client == null) return false; - if (!client.Clan().IsClanChat()) + if (!client.isClanChat()) return false; - ClansClan clan = CUtil().getClanByPlayer(event.getPlayer()); + ClanInfo clan = _clanUtility.getClanByPlayer(event.getPlayer()); if (clan == null) { - Clients().Get(event.getPlayer()).Clan().SetClanChat(false); + Get(event.getPlayer()).setClanChat(false); return false; } @@ -280,10 +285,10 @@ public class ClansManager extends MiniClientPlugin if (!Get(event.getPlayer()).isAllyChat()) return false; - ClansClan clan = CUtil().getClanByPlayer(event.getPlayer()); + ClanInfo clan = _clanUtility.getClanByPlayer(event.getPlayer()); if (clan == null) { - Clients().Get(event.getPlayer()).Clan().SetAllyChat(false); + Get(event.getPlayer()).setAllyChat(false); return false; } @@ -324,59 +329,38 @@ public class ClansManager extends MiniClientPlugin return _reclaimTime; } - @Override - public boolean CanHurt(Player a, Player b) + public boolean canHurt(Player a, Player b) { if (a.equals(b)) return false; - return CUtil().canHurt(a, b); + return _clanUtility.canHurt(a, b); } - @Override - public boolean CanHurt(String a, String b) + public boolean canHurt(String a, String b) { if (a.equals(b)) return false; - return CUtil().canHurt(UtilPlayer.searchExact(a), UtilPlayer.searchExact(b)); + return _clanUtility.canHurt(UtilPlayer.searchExact(a), UtilPlayer.searchExact(b)); } - @Override - public boolean IsSafe(Player a) + public boolean isSafe(Player a) { - return CUtil().isSafe(a); + return _clanUtility.isSafe(a); } - public IRepository GetRepository() { - return _repository; - } - - public void SetRepository(IRepository _repository) { - this._repository = _repository; - } - - public HashMap GetClanMemberMap() + public ClanRelation getRelation(String playerA, String playerB) { - return _clanMemberMap; - } - - public ClanRelation GetRelation(String playerA, String playerB) - { - return Clients().Get(playerA).Clan().GetRelation(playerB); + return Get(playerA).getRelation(playerB); } @Override public ChatColor GetColorOfFor(String other, Player player) { - return CUtil().relChatColor(Clients().Get(player).Clan().GetRelation(other), false); + return _clanUtility.relChatColor(Get(player).getRelation(other), false); } - - public String GetServerName() - { - return _serverName; - } - + public long getOnlineTime() { return _onlineTime; @@ -402,4 +386,34 @@ public class ClansManager extends MiniClientPlugin protected void loadClientInformation(RetrieveClientInformationEvent event) { } + + public BlockRestore getBlockRestore() + { + return _blockRestore; + } + + public ClansDataAccessLayer getClanDataAccess() + { + return _clanDataAccess; + } + + public Teleport getTeleport() + { + return _teleport; + } + + public ClansDisplay getClanDisplay() + { + return _clanDisplay; + } + + public NautHashMap getUnclaimMap() + { + return _unclaimMap; + } + + public ClansAdmin getClanAdmin() + { + return _clanAdmin; + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClientClan.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClientClan.java index bb0a2a2a1..a231d632f 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClientClan.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClientClan.java @@ -9,6 +9,12 @@ public class ClientClan private boolean _canJoin; private long _joinDelay; + private String _territory; + private boolean _autoClaim; + private String _owner; + private boolean _safe; + private String _mimic; + public boolean isAllyChat() { return _allyChat; @@ -48,4 +54,54 @@ public class ClientClan { return _joinDelay; } + + public String getTerritory() + { + return _territory; + } + + public void setTerritory(String territory) + { + _territory = territory; + } + + public boolean isAutoClaim() + { + return _autoClaim; + } + + public String getOwner() + { + return _owner; + } + + public void setOwner(String owner) + { + _owner = owner; + } + + public boolean isSafe() + { + return _safe; + } + + public void setSafe(boolean safe) + { + _safe = safe; + } + + public void setAutoClaim(boolean autoclaim) + { + _autoClaim = autoclaim; + } + + public void setMimic(String mimic) + { + _mimic = mimic; + } + + public String getMimic() + { + return _mimic; + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java index ae7ea0e73..e3a83690d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java @@ -5,11 +5,11 @@ import java.util.ArrayList; import org.bukkit.Chunk; import org.bukkit.entity.Player; -import mineplex.core.account.CoreClient; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilInput; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; @@ -50,7 +50,7 @@ public class ClansCommand extends CommandBase help(caller); else if (args[0].equalsIgnoreCase("admin") || args[0].equalsIgnoreCase("x")) - Plugin.CAdmin().command(caller, args); + Plugin.getClanAdmin().command(caller, args); else if (args[0].equalsIgnoreCase("create")) create(caller, args); @@ -204,7 +204,7 @@ public class ClansCommand extends CommandBase return; } - if (!Plugin.Util().Input().valid(args[1])) + if (!UtilInput.valid(args[1])) { UtilPlayer.message(caller, F.main("Clans", "Invalid characters in Clan name.")); return; @@ -243,8 +243,10 @@ public class ClansCommand extends CommandBase //Inform UtilServer.broadcast(F.main("Clans", F.name(caller.getName()) + " formed " + F.elem("Clan " + args[1]) + ".")); - //Create and Join - Plugin.CTask().join(Plugin.CTask().create(caller.getName(), args[1], false), caller.getName(), Role.LEADER); + + ClanInfo clan = Plugin.getClanDataAccess().create(caller.getName(), args[1], false); + + Plugin.getClanDataAccess().join(clan, caller.getName(), Role.LEADER); } public void delete(Player caller, String[] args) @@ -264,7 +266,7 @@ public class ClansCommand extends CommandBase } //Task - Plugin.CTask().delete(clan); + Plugin.getClanDataAccess().delete(clan); //Inform UtilServer.broadcast(F.main("Clans", F.name(caller.getName()) + " disbanded " + F.elem("Clan " + clan.getName()) + ".")); @@ -310,7 +312,7 @@ public class ClansCommand extends CommandBase UtilPlayer.message(target, F.main("Clans", "Type " + F.elem("/c join " + clan.getName()) + " to accept!")); //Task - Plugin.CTask().invite(clan, target.getName(), caller.getName()); + Plugin.getClanDataAccess().invite(clan, target.getName(), caller.getName()); } public void join(Player caller, String[] args) @@ -337,7 +339,7 @@ public class ClansCommand extends CommandBase return; } - if (!Plugin.Util().Input().valid(args[1])) + if (!UtilInput.valid(args[1])) { UtilPlayer.message(caller, F.main("Clans", "Invalid characters in Clan name.")); return; @@ -354,7 +356,7 @@ public class ClansCommand extends CommandBase } //Task - Plugin.CTask().join(clan, caller.getName(), Role.RECRUIT); + Plugin.getClanDataAccess().join(clan, caller.getName(), Role.RECRUIT); //Inform UtilPlayer.message(caller, F.main("Clans", "You joined " + F.elem("Clan " + clan.getName()) + ".")); @@ -384,7 +386,7 @@ public class ClansCommand extends CommandBase UtilPlayer.message(caller, F.main("Clans", "You left " + F.elem("Clan " + clan.getName()) + ".")); //Task - Plugin.CTask().leave(clan, caller.getName()); + Plugin.getClanDataAccess().leave(clan, caller.getName()); //Inform clan.inform(F.name(caller.getName()) + " has left your Clan.", null); @@ -432,7 +434,7 @@ public class ClansCommand extends CommandBase //Task - Plugin.CTask().leave(clan, target); + Plugin.getClanDataAccess().leave(clan, target); //Inform UtilPlayer.message(UtilPlayer.searchOnline(null, target, false), F.main("Clans", F.name(caller.getName()) + " kicked you from " + F.elem("Clan " + clan.getName()) + ".")); @@ -477,21 +479,21 @@ public class ClansCommand extends CommandBase String newRank = "?"; if (clan.getMembers().get(target) == Role.RECRUIT) { - Plugin.CTask().role(clan, target, Role.MEMBER); + Plugin.getClanDataAccess().role(clan, target, Role.MEMBER); newRank = "Member"; } else if (clan.getMembers().get(target) == Role.MEMBER) { - Plugin.CTask().role(clan, target, Role.ADMIN); + Plugin.getClanDataAccess().role(clan, target, Role.ADMIN); newRank = "Admin"; } else if (clan.getMembers().get(target) == Role.ADMIN) { - Plugin.CTask().role(clan, target, Role.LEADER); + Plugin.getClanDataAccess().role(clan, target, Role.LEADER); newRank = "Leader"; //Give Leader - Plugin.CTask().role(clan, caller.getName(), Role.ADMIN); + Plugin.getClanDataAccess().role(clan, caller.getName(), Role.ADMIN); } //Inform @@ -541,12 +543,12 @@ public class ClansCommand extends CommandBase String newRank = "?"; if (clan.getMembers().get(target) == Role.MEMBER) { - Plugin.CTask().role(clan, target, Role.RECRUIT); + Plugin.getClanDataAccess().role(clan, target, Role.RECRUIT); newRank = "Recruit"; } else if (clan.getMembers().get(target) == Role.ADMIN) { - Plugin.CTask().role(clan, target, Role.MEMBER); + Plugin.getClanDataAccess().role(clan, target, Role.MEMBER); newRank = "Member"; } @@ -608,7 +610,7 @@ public class ClansCommand extends CommandBase if (cB.isRequested(cA.getName())) { //Task - Plugin.CTask().ally(cA, cB, caller.getName()); + Plugin.getClanDataAccess().ally(cA, cB, caller.getName()); //Inform UtilPlayer.message(caller, F.main("Clans", "You accepted alliance with " + F.elem("Clan " + cB.getName()) + ".")); @@ -618,7 +620,7 @@ public class ClansCommand extends CommandBase else { //Task - Plugin.CTask().requestAlly(cA, cB, caller.getName()); + Plugin.getClanDataAccess().requestAlly(cA, cB, caller.getName()); //Inform UtilPlayer.message(caller, F.main("Clans", "You requested alliance with " + F.elem("Clan " + cB.getName()) + ".")); @@ -661,7 +663,7 @@ public class ClansCommand extends CommandBase } //Task - if (Plugin.CTask().trust(cA, cB, caller.getName())) + if (Plugin.getClanDataAccess().trust(cA, cB, caller.getName())) { //Inform UtilPlayer.message(caller, F.main("Clans", "You gave trust to " + F.elem("Clan " + cB.getName()) + ".")); @@ -719,7 +721,7 @@ public class ClansCommand extends CommandBase if (cB.isAlly(cA.getName())) { //Task - Plugin.CTask().neutral(cA, cB, caller.getName(), true); + Plugin.getClanDataAccess().neutral(cA, cB, caller.getName(), true); //Inform UtilPlayer.message(caller, F.main("Clans", "You revoked alliance with " + F.elem("Clan " + cB.getName()) + ".")); @@ -864,7 +866,7 @@ public class ClansCommand extends CommandBase return; //Task - Plugin.CTask().claim(clan.getName(), chunk, caller.getName(), false); + Plugin.getClanDataAccess().claim(clan.getName(), chunk, caller.getName(), false); //Inform UtilPlayer.message(caller, F.main("Clans", "You claimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".")); @@ -936,7 +938,7 @@ public class ClansCommand extends CommandBase } //Task - Plugin.CTask().unclaim(chunk, caller.getName(), true); + Plugin.getClanDataAccess().unclaim(chunk, caller.getName(), true); //Inform UtilPlayer.message(caller, F.main("Clans", "You unclaimed Territory " + F.elem(UtilWorld.chunkToStrClean(caller.getLocation().getChunk())) + ".")); @@ -964,7 +966,7 @@ public class ClansCommand extends CommandBase F.elem(ownerClan.getName()) + " at " + F.elem(UtilWorld.locToStrClean(caller.getLocation())) + ".")); //Unclaim - Plugin.CTask().unclaim(UtilWorld.chunkToStr(caller.getLocation().getChunk()), caller.getName(), true); + Plugin.getClanDataAccess().unclaim(UtilWorld.chunkToStr(caller.getLocation().getChunk()), caller.getName(), true); return true; } @@ -992,7 +994,7 @@ public class ClansCommand extends CommandBase toUnclaim.add(chunk); for (String chunk : toUnclaim) - Plugin.CTask().unclaim(chunk, caller.getName(), true); + Plugin.getClanDataAccess().unclaim(chunk, caller.getName(), true); //Inform UtilPlayer.message(caller, F.main("Clans", "You unclaimed all your Clans Territory.")); @@ -1013,8 +1015,8 @@ public class ClansCommand extends CommandBase } //Display - Plugin.CDisplay().displayOwner(caller); - Plugin.CDisplay().displayMap(caller); + Plugin.getClanDisplay().displayOwner(caller); + Plugin.getClanDisplay().displayMap(caller); } public void home(Player caller, String[] args) @@ -1075,7 +1077,7 @@ public class ClansCommand extends CommandBase return; //Do - Plugin.Teleport().TP(caller, clan.GetHome()); + Plugin.getTeleport().TP(caller, clan.getHome()); //Inform UtilPlayer.message(caller, F.main("Clans", "You teleported to your Clan Home " + UtilWorld.locToStrClean(caller.getLocation()) + ".")); @@ -1110,7 +1112,7 @@ public class ClansCommand extends CommandBase } //Task - Plugin.CTask().home(clan, caller.getLocation(), caller.getName()); + Plugin.getClanDataAccess().home(clan, caller.getLocation(), caller.getName()); //Inform UtilPlayer.message(caller, F.main("Clans", "You set Clan Home to " + UtilWorld.locToStrClean(caller.getLocation()) + ".")); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanRepository.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanRepository.java index 0e25e07ff..14693cdea 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanRepository.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanRepository.java @@ -9,6 +9,9 @@ import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.common.util.NautHashMap; import mineplex.core.database.RepositoryBase; import mineplex.core.database.ResultSetCallable; +import mineplex.core.database.column.ColumnBoolean; +import mineplex.core.database.column.ColumnInt; +import mineplex.core.database.column.ColumnLong; import mineplex.core.database.column.ColumnVarChar; import mineplex.game.clans.clans.repository.tokens.ClanAllianceToken; import mineplex.game.clans.clans.repository.tokens.ClanMemberToken; @@ -26,6 +29,24 @@ public class ClanRepository extends RepositoryBase private static String RETRIEVE_CLAN_MEMBER_INFO = "SELECT c.name, a.name, role FROM accountClan AS ac INNER JOIN accounts AS a ON a.id = ac.accountId INNER JOIN clans AS c on c.id = ac.clanId;"; private static String RETRIEVE_CLAN_ALLIANCE_INFO = "SELECT c.name, cOther.name, ca.trusted FROM clanAlliances AS ca INNER JOIN clans AS c ON c.id = ca.clanId INNER JOIN clans as cOther ON cOther.id = ca.otherClanId;"; + private static String DELETE_CLAN_MEMBER = "DELETE FROM accountClan INNER JOIN accounts ON accounts.id = accountClan.accountId WHERE clans.id = ? AND accounts.name = ?;"; + private static String DELETE_CLAN_MEMBERS = "DELETE FROM accountClan INNER JOIN clans ON clans.id = accountClan.clanId WHERE clans.name = ?;"; + private static String DELETE_CLAN_TERRITORY = "DELETE FROM clanTerritory WHERE clanId = ? AND serverName = ? AND chunk = ?;"; + private static String DELETE_CLAN_TERRITORIES = "DELETE FROM clanTerritory INNER JOIN clans ON clans.id = clanTerritory.clanId WHERE clans.name = ?;"; + private static String DELETE_CLAN_ALLIANCE = "DELETE FROM clanAlliances WHERE clanId = ? AND otherClanId = ?;"; + private static String DELETE_CLAN_ALLIANCES = "DELETE FROM clanAlliances INNER JOIN clans ON clans.id = clanAlliances.clanId WHERE clans.name = ?;"; + private static String DELETE_CLAN = "DELETE FROM clans WHERE name = ?;"; + + private static String ADD_CLAN = "INSERT INTO clans (name, description, home, admin, dateCreated, lastOnline) VALUES (?, ?, ?, ?, now(), now());"; + private static String ADD_CLAN_MEMBER = "INSERT INTO accountClan (accountId, clanId, clanRole) SELECT accounts.id, ?, ? FROM accounts WHERE accounts.name = ?;"; + private static String ADD_CLAN_ALLIANCE = "INSERT INTO clanAlliances (clandId, otherClanId, trusted) VALUES (?, ?, ?);"; + private static String ADD_CLAN_TERRITORY = "INSERT INTO clanTerritory (clanId, serverName, chunk, safe) VALUES (?, ?, ?, ?);"; + + private static String UPDATE_CLAN = "UPDATE clans SET name = ?, desc = ?, home = ?, admin = ?, lastOnline = ? WHERE id = ?;"; + private static String UPDATE_CLAN_MEMBER = "UPDATE AC SET clanRole = ? FROM accountClan AS AC INNER JOIN accounts ON accounts.id = accountClan.accountId WHERE clans.id = ? AND accounts.name = ?;"; + private static String UPDATE_CLAN_ALLIANCE = "UPDATE clanAlliances SET trusted = ? WHERE clanId = ? AND otherClanId = ?;"; + private static String UPDATE_CLAN_TERRITORY = "UPDATE clanTerritory SET safe = ? WHERE serverName = ? AND chunk = ?;"; + private String _serverName; public ClanRepository(JavaPlugin plugin, String serverName) @@ -130,4 +151,79 @@ public class ClanRepository extends RepositoryBase protected void update() { } + + public void deleteClan(String name) + { + executeUpdate(DELETE_CLAN_MEMBERS, new ColumnVarChar("name", 100, name)); + executeUpdate(DELETE_CLAN_TERRITORIES, new ColumnVarChar("name", 100, name)); + executeUpdate(DELETE_CLAN_ALLIANCES, new ColumnVarChar("name", 100, name)); + executeUpdate(DELETE_CLAN, new ColumnVarChar("name", 100, name)); + } + + public void addClan(final ClanToken token) + { + executeUpdate(ADD_CLAN, new ResultSetCallable() + { + @Override + public void processResultSet(ResultSet resultSet) throws SQLException + { + while (resultSet.next()) + { + executeUpdate(ADD_CLAN_MEMBER, new ColumnInt("clanid", resultSet.getInt(0)), new ColumnVarChar("clanRole", 100, token.Members.get(0).ClanRole), new ColumnVarChar("name", 100, token.Members.get(0).Name)); + } + } + + }, new ColumnVarChar("name", 100, token.Name), new ColumnVarChar("description", 100, token.Description), new ColumnVarChar("home", 100, token.Home), new ColumnBoolean("admin", token.Admin)); + + } + + public void addMember(int clanId, String playerName, String role) + { + executeUpdate(ADD_CLAN_MEMBER, new ColumnInt("clanid", clanId), new ColumnVarChar("clanRole", 100, role), new ColumnVarChar("name", 100, playerName)); + } + + public void removeMember(int clanId, String playerName) + { + executeUpdate(DELETE_CLAN_MEMBER, new ColumnInt("clanid", clanId), new ColumnVarChar("name", 100, playerName)); + } + + public void updateMember(int clanId, String playerName, String role) + { + executeUpdate(UPDATE_CLAN_MEMBER, new ColumnInt("clanid", clanId), new ColumnVarChar("clanRole", 100, role), new ColumnVarChar("name", 100, playerName)); + } + + public void addClanRelationship(int clanId, int otherClanId, boolean trusted) + { + executeUpdate(ADD_CLAN_ALLIANCE, new ColumnInt("clanid", clanId), new ColumnInt("otherClanId", otherClanId), new ColumnBoolean("trusted", trusted)); + } + + public void updateClanRelationship(int clanId, int otherClanId, boolean trusted) + { + executeUpdate(UPDATE_CLAN_ALLIANCE, new ColumnInt("clanid", clanId), new ColumnInt("otherClanId", otherClanId), new ColumnBoolean("trusted", trusted)); + } + + public void removeClanRelationship(int clanId, int otherClanId) + { + executeUpdate(DELETE_CLAN_ALLIANCE, new ColumnInt("clanid", clanId), new ColumnInt("otherClanId", otherClanId)); + } + + public void addTerritoryClaim(int clanId, String chunk, boolean safe) + { + executeUpdate(ADD_CLAN_TERRITORY, new ColumnInt("clanId", clanId), new ColumnVarChar("serverName", 100, _serverName), new ColumnVarChar("chunk", 100, chunk), new ColumnBoolean("safe", safe)); + } + + public void removeTerritoryClaim(int clanId, String chunk) + { + executeUpdate(DELETE_CLAN_TERRITORY, new ColumnInt("clanId", clanId), new ColumnVarChar("serverName", 100, _serverName), new ColumnVarChar("chunk", 100, chunk)); + } + + public void updateClan(int clanId, String name, String desc, String home, boolean admin, long lastOnline) + { + executeUpdate(UPDATE_CLAN, new ColumnVarChar("name", 100, name), new ColumnVarChar("desc", 100, desc), new ColumnVarChar("home", 100, home), new ColumnBoolean("admin", admin), new ColumnLong("lastOnline", lastOnline), new ColumnInt("clanId", clanId)); + } + + public void updateTerritoryClaim(String chunk, boolean safe) + { + executeUpdate(UPDATE_CLAN_TERRITORY, new ColumnBoolean("safe", safe), new ColumnVarChar("serverName", 100, _serverName), new ColumnVarChar("chunk", 100, chunk)); + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanTerritory.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanTerritory.java index 9db9852a1..c80a22d07 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanTerritory.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/repository/ClanTerritory.java @@ -4,4 +4,5 @@ public class ClanTerritory { public boolean Safe; public String Owner; + public String Chunk; } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index b3d9a4ea0..b3a27efe1 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -5,8 +5,8 @@ import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.CustomTagFix; import mineplex.core.account.CoreClientManager; +import mineplex.core.achievement.AchievementManager; import mineplex.core.antihack.AntiHack; -import mineplex.core.antistack.AntiStack; import mineplex.core.blockrestore.BlockRestore; import mineplex.core.chat.Chat; import mineplex.core.command.CommandCenter; @@ -16,6 +16,7 @@ import mineplex.core.donation.DonationManager; import mineplex.core.elo.EloManager; import mineplex.core.energy.Energy; import mineplex.core.friend.FriendManager; +import mineplex.core.hologram.HologramManager; import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.logger.Logger; import mineplex.core.memory.MemoryFix; @@ -32,6 +33,7 @@ import mineplex.core.punish.Punish; import mineplex.core.recharge.Recharge; import mineplex.core.serverConfig.ServerConfiguration; import mineplex.core.spawn.Spawn; +import mineplex.core.stats.StatsManager; import mineplex.core.status.ServerStatusManager; import mineplex.core.task.TaskManager; import mineplex.core.teleport.Teleport; @@ -89,20 +91,20 @@ public class Hub extends JavaPlugin implements IRelation Creature creature = new Creature(this); NpcManager npcManager = new NpcManager(this, creature); PetManager petManager = new PetManager(this, clientManager, donationManager, creature, webServerAddress); - new AntiStack(this); PollManager pollManager = new PollManager(this, donationManager); //Main Modules ServerStatusManager serverStatusManager = new ServerStatusManager(this, new LagMeter(this, clientManager)); - //new FriendManager(this, packetHandler); PartyManager partyManager = new PartyManager(this, clientManager, preferenceManager); Portal portal = new Portal(this, serverStatusManager.getCurrentServerName()); AntiHack.Initialize(this, punish, portal, preferenceManager, clientManager); PacketHandler packetHandler = new PacketHandler(this); DisguiseManager disguiseManager = new DisguiseManager(this, packetHandler); - HubManager hubManager = new HubManager(this, new BlockRestore(this), clientManager, donationManager, new ConditionManager(this), disguiseManager, new TaskManager(this, webServerAddress), portal, partyManager, preferenceManager, petManager, pollManager); + StatsManager statsManager = new StatsManager(this, clientManager); + AchievementManager achievementManager = new AchievementManager(statsManager, clientManager, donationManager); + HubManager hubManager = new HubManager(this, new BlockRestore(this), clientManager, donationManager, new ConditionManager(this), disguiseManager, new TaskManager(this, webServerAddress), portal, partyManager, preferenceManager, petManager, pollManager, statsManager, achievementManager, new HologramManager(this)); - QueueManager queueManager = new QueueManager(this, clientManager, donationManager, new EloManager(this), partyManager); + QueueManager queueManager = new QueueManager(this, clientManager, donationManager, new EloManager(this, clientManager), partyManager); new ServerManager(this, clientManager, donationManager, portal, partyManager, serverStatusManager, hubManager, new StackerManager(hubManager), queueManager); new Chat(this, clientManager, preferenceManager, serverStatusManager.getCurrentServerName()); @@ -126,7 +128,7 @@ public class Hub extends JavaPlugin implements IRelation SkillFactory skillManager = new SkillFactory(this, damage, this, combatManager, conditionManager, throwManager, disguiseManager, blockRestore, fire, new Movement(this), teleport, energy, webServerAddress); ClassManager classManager = new ClassManager(this, clientManager, donationManager, skillManager, itemFactory, webServerAddress); - ClassShopManager shopManager = new ClassShopManager(this, classManager, skillManager, itemFactory); + ClassShopManager shopManager = new ClassShopManager(this, classManager, skillManager, itemFactory, achievementManager, clientManager); new ClassCombatShop(shopManager, clientManager, donationManager, "Brute", classManager.GetClass("Brute")); new ClassCombatShop(shopManager, clientManager, donationManager, "Mage", classManager.GetClass("Mage")); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index 3fd9b1eb9..809f811eb 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -40,12 +40,10 @@ import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Scoreboard; import mineplex.core.MiniClientPlugin; -import mineplex.core.RankBenefitsGiver9000; import mineplex.core.account.CoreClient; import mineplex.core.account.CoreClientManager; -import mineplex.core.account.event.RetrieveClientInformationEvent; -import mineplex.core.achievement.Achievement; import mineplex.core.achievement.AchievementManager; +import mineplex.core.benefit.BenefitManager; import mineplex.core.blockrestore.BlockRestore; import mineplex.core.common.Rank; import mineplex.core.common.util.C; @@ -66,6 +64,7 @@ import mineplex.core.donation.DonationManager; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.event.GadgetActivateEvent; import mineplex.core.gadget.event.GadgetCollideEntityEvent; +import mineplex.core.hologram.HologramManager; import mineplex.core.inventory.InventoryManager; import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.mount.MountManager; @@ -146,7 +145,7 @@ public class HubManager extends MiniClientPlugin //Admin private boolean _gadgetsEnabled = true; - public HubManager(JavaPlugin plugin, BlockRestore blockRestore, CoreClientManager clientManager, DonationManager donationManager, ConditionManager conditionManager, DisguiseManager disguiseManager, TaskManager taskManager, Portal portal, PartyManager partyManager, PreferencesManager preferences, PetManager petManager, PollManager pollManager) + public HubManager(JavaPlugin plugin, BlockRestore blockRestore, CoreClientManager clientManager, DonationManager donationManager, ConditionManager conditionManager, DisguiseManager disguiseManager, TaskManager taskManager, Portal portal, PartyManager partyManager, PreferencesManager preferences, PetManager petManager, PollManager pollManager, StatsManager statsManager, AchievementManager achievementManager, HologramManager hologramManager) { super("Hub Manager", plugin); @@ -159,6 +158,8 @@ public class HubManager extends MiniClientPlugin _portal = portal; _spawn = new Location(UtilWorld.getWorld("world"), 0.5, 74, 0.5); + // Disable item merging + ((CraftWorld) _spawn.getWorld()).getHandle().spigotConfig.itemMerge = 0; _textCreator = new TextManager(this); _parkour = new ParkourManager(this, donationManager, taskManager); @@ -172,10 +173,10 @@ public class HubManager extends MiniClientPlugin _news = new NewsManager(this); _mountManager = new MountManager(_plugin, clientManager, donationManager, blockRestore, _disguiseManager); - _inventoryManager = new InventoryManager(plugin); - new RankBenefitsGiver9000(plugin, clientManager, _inventoryManager); + _inventoryManager = new InventoryManager(plugin, clientManager); + new BenefitManager(plugin, clientManager, _inventoryManager); _gadgetManager = new GadgetManager(_plugin, clientManager, donationManager, _inventoryManager, _mountManager, petManager, preferences, disguiseManager, blockRestore, new ProjectileManager(plugin)); - _treasureManager = new TreasureManager(_plugin, donationManager, _inventoryManager, petManager, _blockRestore); + _treasureManager = new TreasureManager(_plugin, donationManager, _inventoryManager, petManager, _blockRestore, hologramManager); new CosmeticManager(_plugin, clientManager, donationManager, _inventoryManager, _gadgetManager, _mountManager, petManager, false, _treasureManager); _partyManager = partyManager; @@ -186,8 +187,8 @@ public class HubManager extends MiniClientPlugin _forcefieldManager = new ForcefieldManager(this); addCommand(new ForcefieldRadius(_forcefieldManager)); - _statsManager = new StatsManager(plugin); - _achievementManager = new AchievementManager(_statsManager, _clientManager, _donationManager); + _statsManager = statsManager; + _achievementManager = achievementManager; _achievementManager.setGiveInterfaceItem(true); ((CraftWorld)Bukkit.getWorlds().get(0)).getHandle().pvpMode = true; @@ -964,12 +965,6 @@ public class HubManager extends MiniClientPlugin return _news; } - @Override - protected void loadClientInformation(RetrieveClientInformationEvent event) - { - - } - @EventHandler public void ignoreVelocity(PlayerVelocityEvent event) { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PlayerPollData.java b/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PlayerPollData.java index 839fee3a1..e0de0ec32 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PlayerPollData.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PlayerPollData.java @@ -13,6 +13,8 @@ public class PlayerPollData private NautHashMap _pollAnswers; private long _nextPollTime; + public boolean Loaded; + public PlayerPollData() { _pollAnswers = new NautHashMap(); @@ -40,7 +42,7 @@ public class PlayerPollData public boolean shouldPoll() { - return System.currentTimeMillis() > _nextPollTime; + return Loaded && System.currentTimeMillis() > _nextPollTime; } } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java index a52e8b6f7..0d7b68656 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java @@ -14,7 +14,6 @@ import net.minecraft.server.v1_7_R4.PacketPlayOutChat; import net.minecraft.util.com.google.gson.JsonObject; import mineplex.core.MiniClientPlugin; -import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.common.util.C; import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; @@ -24,9 +23,6 @@ import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.hub.poll.command.PollCommand; -/** - * Created by Shaun on 8/16/2014. - */ public class PollManager extends MiniClientPlugin { private PollRepository _repository; @@ -57,17 +53,14 @@ public class PollManager extends MiniClientPlugin return new PlayerPollData(); } - @Override - protected void loadClientInformation(final RetrieveClientInformationEvent event) + public void loadClientInformation(final PlayerJoinEvent event) { - event.incrementProcessingCount(); _plugin.getServer().getScheduler().runTaskAsynchronously(_plugin, new Runnable() { @Override public void run() { - Set(event.getPlayerName(), _repository.loadPollData(event.getUniqueId())); - event.decreaseProcessingCount(); + Set(event.getPlayer().getName(), _repository.loadPollData(event.getPlayer().getUniqueId())); } }); } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollRepository.java b/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollRepository.java index f96c2a875..fa2a25e80 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollRepository.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollRepository.java @@ -89,6 +89,8 @@ public class PollRepository extends RepositoryBase } }, new ColumnVarChar("uuid", 100, uuid.toString())); + pollData.Loaded = true; + return pollData; } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java index 005ada843..da3bf384a 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java @@ -145,6 +145,8 @@ public class ServerManager extends MiniPlugin long timeUntilPortal = getMillisecondsUntilPortal(player, false); if (!_hubManager.CanPortal(player) || timeUntilPortal > 0) { + player.closeInventory(); + if (timeUntilPortal > 0) { player.playSound(player.getEyeLocation(), Sound.CHICKEN_EGG_POP, 2, 2); diff --git a/Plugins/Mineplex.MapParser/src/mineplex/mapparser/GameType.java b/Plugins/Mineplex.MapParser/src/mineplex/mapparser/GameType.java index 2688c0170..d64af0113 100644 --- a/Plugins/Mineplex.MapParser/src/mineplex/mapparser/GameType.java +++ b/Plugins/Mineplex.MapParser/src/mineplex/mapparser/GameType.java @@ -29,6 +29,7 @@ public enum GameType SurvivalGames("Survival Games"), SurvivalGamesTeams("Survival Games Teams"), Micro("Micro Battle"), + MineStrike("MineStrike"), MineWare("MineWare"), MilkCow("Milk the Cow"), Paintball("Super Paintball"), @@ -49,6 +50,7 @@ public enum GameType Tug("Tug of Wool"), TurfWars("Turf Wars"), UHC("Ultra Hardcore"), + WitherAssault("Wither Assault"), ZombieSurvival("Zombie Survival"), None("None"); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClassManager.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClassManager.java index ba0ca9f61..ba74c9b27 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClassManager.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClassManager.java @@ -9,12 +9,10 @@ import mineplex.minecraft.game.classcombat.Class.repository.token.ClientClassTok import mineplex.minecraft.game.classcombat.Class.repository.token.CustomBuildToken; import mineplex.minecraft.game.classcombat.Skill.ISkill; import mineplex.minecraft.game.classcombat.Skill.SkillFactory; -import mineplex.minecraft.game.classcombat.Skill.ISkill.SkillType; import mineplex.minecraft.game.classcombat.item.ItemFactory; import mineplex.core.MiniClientPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.account.event.ClientWebResponseEvent; -import mineplex.core.account.event.RetrieveClientInformationEvent; import mineplex.core.donation.DonationManager; import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.UpdateType; @@ -309,9 +307,4 @@ public class ClassManager extends MiniClientPlugin implements IClas event.setCancelled(true); } } - - @Override - protected void loadClientInformation(RetrieveClientInformationEvent event) - { - } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java index cd853db61..9685fb8a4 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java @@ -98,7 +98,6 @@ public class ClientClass else skillTokenUsage += swordSkill.GetTokenCost() * buildToken.SwordSkillLevel; } - if (!buildToken.AxeSkill.isEmpty()) { @@ -139,9 +138,7 @@ public class ClientClass else skillTokenUsage += globalPassive.GetTokenCost() * buildToken.GlobalPassiveSkillLevel; } - - boolean allEmpty = true; - + for (SlotToken slotToken : buildToken.Slots) { if (slotToken == null) @@ -153,45 +150,43 @@ public class ClientClass if (slotToken.Material.isEmpty()) continue; - allEmpty = false; - - //itemTokenUsage += _itemFactory.GetItem(slotToken.Name).getTokenCost(); + itemTokenUsage += _itemFactory.GetItem(slotToken.Name.equalsIgnoreCase("Cobweb") ? "Web" : slotToken.Name).getTokenCost(); } - //itemTokenUsage += buildToken.ItemTokens; - //skillTokenUsage += buildToken.SkillTokens; + itemTokenUsage += buildToken.ItemTokens; + skillTokenUsage += buildToken.SkillTokens; - /* if (itemTokenUsage > CustomBuildToken.MAX_ITEM_TOKENS || skillTokenUsage > CustomBuildToken.MAX_SKILL_TOKENS) { System.out.println(buildToken.PvpClass + " " + buildToken.CustomBuildId + "'s item tokens :" + itemTokenUsage + " skill tokens :" + skillTokenUsage); continue; } - */ + /* if (allEmpty) { buildToken.SkillTokens = CustomBuildToken.MAX_SKILL_TOKENS; buildToken.ItemTokens = CustomBuildToken.MAX_ITEM_TOKENS; - if (!buildToken.SwordSkill.isEmpty() && !ValidSkill(buildToken.SwordSkill, swordSkill, SkillType.Sword)) + if (!buildToken.SwordSkill.isEmpty() && ValidSkill(buildToken.SwordSkill, swordSkill, SkillType.Sword)) buildToken.SkillTokens -= swordSkill.GetTokenCost(); - if (!buildToken.AxeSkill.isEmpty() && !ValidSkill(buildToken.AxeSkill, axeSkill, SkillType.Axe)) + if (!buildToken.AxeSkill.isEmpty() && ValidSkill(buildToken.AxeSkill, axeSkill, SkillType.Axe)) buildToken.SkillTokens -= axeSkill.GetTokenCost(); - if (!buildToken.BowSkill.isEmpty() && !ValidSkill(buildToken.BowSkill, bowSkill, SkillType.Bow)) + if (!buildToken.BowSkill.isEmpty() && ValidSkill(buildToken.BowSkill, bowSkill, SkillType.Bow)) buildToken.SkillTokens -= bowSkill.GetTokenCost(); - if (!buildToken.ClassPassiveASkill.isEmpty() && !ValidSkill(buildToken.ClassPassiveASkill, classPassiveASkill, SkillType.PassiveA)) + if (!buildToken.ClassPassiveASkill.isEmpty() && ValidSkill(buildToken.ClassPassiveASkill, classPassiveASkill, SkillType.PassiveA)) buildToken.SkillTokens -= classPassiveASkill.GetTokenCost(); - if (!buildToken.ClassPassiveBSkill.isEmpty() && !ValidSkill(buildToken.ClassPassiveBSkill, classPassiveBSkill, SkillType.PassiveB)) + if (!buildToken.ClassPassiveBSkill.isEmpty() && ValidSkill(buildToken.ClassPassiveBSkill, classPassiveBSkill, SkillType.PassiveB)) buildToken.SkillTokens -= classPassiveBSkill.GetTokenCost(); - if (!buildToken.GlobalPassiveSkill.isEmpty() && !ValidSkill(buildToken.GlobalPassiveSkill, globalPassive, SkillType.GlobalPassive)) + if (!buildToken.GlobalPassiveSkill.isEmpty() && ValidSkill(buildToken.GlobalPassiveSkill, globalPassive, SkillType.GlobalPassive)) buildToken.SkillTokens -= globalPassive.GetTokenCost(); } + */ _customBuilds.get(pvpClass).put(buildToken.CustomBuildNumber, buildToken); } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/repository/token/CustomBuildToken.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/repository/token/CustomBuildToken.java index 29f4b1c22..06f4183d8 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/repository/token/CustomBuildToken.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/repository/token/CustomBuildToken.java @@ -80,7 +80,7 @@ public class CustomBuildToken } else { - Slots.set(7, new SlotToken("Cobweb", Material.WEB, 3)); + Slots.set(7, new SlotToken("Web", Material.WEB, 3)); } Slots.set(8, new SlotToken()); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java index a59f02ce2..f640e6181 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java @@ -1,17 +1,23 @@ package mineplex.minecraft.game.classcombat.Skill.Assassin; +import java.util.ArrayList; import java.util.HashMap; +import java.util.Set; import net.minecraft.util.com.mojang.authlib.GameProfile; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.entity.Skeleton; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.block.Action; import org.bukkit.event.entity.EntityDeathEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.inventory.ItemStack; import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType; @@ -19,12 +25,15 @@ import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.UpdateType; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAction; +import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilEnt; +import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilParticle.ParticleType; +import mineplex.core.common.util.UtilWorld; import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.minecraft.game.classcombat.Skill.SkillActive; import mineplex.minecraft.game.classcombat.Skill.SkillFactory; @@ -51,21 +60,26 @@ public class Illusion extends SkillActive SetDesc(new String[] { - "Block to go invisible, and create an", + "Hold Block to go invisible and create an", "illusion of yourself that runs towards", "your target location.", "", "Invisibility ends if you release Block", "or your Illusion is killed.", "", - "Lasts up to #2#2 seconds.", + "Illusion lasts up to #2#1 seconds.", + "", + "Gives Slow 2 for up to 4 seconds", + "to nearby players upon ending." }); + + setAchievementSkill(true); } @Override public String GetEnergyString() { - return "Energy: #30#-5 and #10#-2 per Second"; + return "Energy: #40#-3 and #12.5#-0.5 per Second"; } @Override @@ -100,13 +114,23 @@ public class Illusion extends SkillActive skel.getEquipment().setLeggings(player.getInventory().getLeggings()); skel.getEquipment().setBoots(player.getInventory().getBoots()); skel.getEquipment().setItemInHand(Math.random() > 0.5 ? player.getItemInHand() : new ItemStack(Material.IRON_AXE)); + + //Get in range + ArrayList inRange = new ArrayList(); + for (Player other : UtilServer.getPlayers()) + if (UtilMath.offset2d(skel, other) < 70) + inRange.add(other); + + Player[] disguiseList = new Player[inRange.size()]; + for (int i=0 ; i targets = UtilEnt.getInRadius(skel.getLocation(), 6d + 0.5 * level); + for (LivingEntity cur : targets.keySet()) + { + if (cur.equals(player)) + continue; + + //Condition + Factory.Condition().Factory().Slow(GetName(), cur, player, 4 * targets.get(cur), 1, false, false, false, false); + } + + //Effect UtilParticle.PlayParticle(ParticleType.LARGE_SMOKE, skel.getLocation().add(0, 1, 0), 0.3f, 0.3f, 0.3f, 0.06f, 30); for (int i=0 ; i<2 ; i++) skel.getWorld().playSound(skel.getLocation(), Sound.FIZZ, 2f, 0.4f); + skel.getEquipment().clear(); skel.remove(); } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/CripplingBlow.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/CripplingBlow.java index 40d570fe3..9d85fd230 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/CripplingBlow.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/CripplingBlow.java @@ -22,7 +22,7 @@ public class CripplingBlow extends Skill SetDesc(new String[] { - "Your powerflow axe blows give", + "Your powerful axe attacks give", "targets Slow 1 for 1.5 second,", "as well as no knockback." }); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java index 2227b4c53..a637324df 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java @@ -80,8 +80,8 @@ public class SeismicSlam extends SkillActive SetDesc(new String[] { "Jump up and slam back into the ground.", - "Players within #6#0.5 Blocks take up to", - "#2#1 damage and are thrown into the air.", + "Players within #5.5#0.5 Blocks take up to", + "#1#1 damage and are thrown into the air.", }); } @@ -137,7 +137,7 @@ public class SeismicSlam extends SkillActive _live.remove(player); //Action - HashMap targets = UtilEnt.getInRadius(player.getLocation(), 6d + 0.5 * level); + HashMap targets = UtilEnt.getInRadius(player.getLocation(), 5.5d + 0.5 * level); for (LivingEntity cur : targets.keySet()) { if (cur.equals(player)) @@ -145,13 +145,13 @@ public class SeismicSlam extends SkillActive //Damage Event Factory.Damage().NewDamageEvent(cur, player, null, - DamageCause.CUSTOM, (2+level) * targets.get(cur) + 0.5, false, true, false, + DamageCause.CUSTOM, (1+level) * targets.get(cur) + 0.5, false, true, false, player.getName(), GetName()); //Velocity UtilAction.velocity(cur, UtilAlg.getTrajectory2d(player.getLocation().toVector(), cur.getLocation().toVector()), - 1.8 * targets.get(cur), true, 0, 0.4 + 1.0 * targets.get(cur), 1.6, true); + 0.2 + 1.6 * targets.get(cur), true, 0, 0.2 + 1.2 * targets.get(cur), 1.6, true); //Condition Factory.Condition().Factory().Falling(GetName(), cur, player, 10, false, true); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java index 0a7499f7a..31ca861ab 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java @@ -37,4 +37,6 @@ public interface ISkill Integer GetSalesPackageId(); int getMaxLevel(); + + boolean isAchievementSkill(); } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java new file mode 100644 index 000000000..daf1b4245 --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java @@ -0,0 +1,233 @@ +package mineplex.minecraft.game.classcombat.Skill.Knight; + +import java.util.HashMap; +import java.util.Iterator; + +import org.bukkit.Effect; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.block.Block; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Item; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.block.Action; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.player.PlayerPickupItemEvent; +import org.bukkit.util.Vector; + +import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilAction; +import mineplex.core.common.util.UtilEnt; +import mineplex.core.common.util.UtilInv; +import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.projectile.IThrown; +import mineplex.core.projectile.ProjectileUser; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; +import mineplex.minecraft.game.classcombat.Skill.SkillActive; +import mineplex.minecraft.game.classcombat.Skill.SkillFactory; + +public class AxeThrow extends SkillActive implements IThrown +{ + private HashMap _thrown = new HashMap(); + + public AxeThrow(SkillFactory skills, String name, ClassType classType, SkillType skillType, + int cost, int levels, + int energy, int energyMod, + long recharge, long rechargeMod, boolean rechargeInform, + Material[] itemArray, + Action[] actionArray) + { + super(skills, name, classType, skillType, + cost, levels, + energy, energyMod, + recharge, rechargeMod, rechargeInform, + itemArray, + actionArray); + + SetDesc(new String[] + { + "Throw your axe with #0.7#0.1 velocity, ", + "dealing #6.5#0.5 damage.", + "", + "You pull your axe back to you when it", + "collides with anything.", + "", + "Your axe is returned to you if you do", + "not pick it up within #20#-2 seconds." + }); + + setAchievementSkill(true); + } + + @Override + public boolean CustomCheck(Player player, int level) + { + if (player.getLocation().getBlock().getTypeId() == 8 || player.getLocation().getBlock().getTypeId() == 9) + { + UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); + return false; + } + + return true; + } + + @Override + public void Skill(Player player, int level) + { + //Inform + UtilPlayer.message(player, F.main("Game", "You used " + F.skill(GetName()) + ".")); + + //Throw + Item item = player.getWorld().dropItem(player.getEyeLocation(), player.getItemInHand()); + UtilAction.velocity(item, player.getLocation().getDirection(), 0.7 + 0.1 * level, false, 0, 0.2, 10, true); + + player.setItemInHand(null); + + //Projectile + Factory.Projectile().AddThrow(item, player, this, -1, true, true, true, false, 2.5d); + + //Store + _thrown.put(item, player); + + //Inform + UtilPlayer.message(player, F.main(GetClassType().name(), "You used " + F.skill(GetName(level)) + ".")); + } + + @Override + public void Collide(LivingEntity target, Block block, ProjectileUser data) + { + Rebound(data.GetThrower(), data.GetThrown()); + + if (target == null) + return; + + int level = getLevel(data.GetThrower()); + if (level <= 0) + return; + + double damage = 6.5 + 0.5 * level; + + //Damage Event + Factory.Damage().NewDamageEvent(target, data.GetThrower(), null, + DamageCause.CUSTOM, damage, true, true, false, + UtilEnt.getName(data.GetThrower()), GetName()); + } + + @Override + public void Idle(ProjectileUser data) + { + Rebound(data.GetThrower(), data.GetThrown()); + } + + @Override + public void Expire(ProjectileUser data) + { + Rebound(data.GetThrower(), data.GetThrown()); + } + + public void Rebound(LivingEntity player, Entity ent) + { + ent.getWorld().playSound(ent.getLocation(), Sound.ZOMBIE_WOOD, 0.6f, 0.5f); + + double mult = 0.5 + (0.6 * (UtilMath.offset(player.getLocation(), ent.getLocation())/16d)); + + //Velocity + ent.setVelocity(player.getLocation().toVector().subtract(ent.getLocation().toVector()).normalize().add(new Vector(0, 0.4, 0)).multiply(mult)); + + //Ticks + if (ent instanceof Item) + ((Item)ent).setPickupDelay(5); + } + + @EventHandler + public void pickup(PlayerPickupItemEvent event) + { + if (!_thrown.containsKey(event.getItem())) + return; + + event.setCancelled(true); + + Player player = _thrown.remove(event.getItem()); + + player.getInventory().addItem(event.getItem().getItemStack()); + + UtilInv.Update(event.getPlayer()); + + event.getItem().remove(); + + player.playSound(player.getLocation(), Sound.CHICKEN_EGG_POP, 1f, 1f); + } + + @EventHandler + public void timeout(UpdateEvent event) + { + if (event.getType() != UpdateType.FAST) + return; + + Iterator itemIterator = _thrown.keySet().iterator(); + + while (itemIterator.hasNext()) + { + Item item = itemIterator.next(); + + Player player = _thrown.get(item); + if (!player.isOnline()) + { + item.remove(); + itemIterator.remove(); + continue; + } + + int level = getLevel(player); + + if (item.getTicksLived() > 400 - level * 40) + { + _thrown.get(item).getInventory().addItem(item.getItemStack()); + item.remove(); + itemIterator.remove(); + } + } + } + + @EventHandler + public void death(PlayerDeathEvent event) + { + Iterator i = _thrown.keySet().iterator(); + + while (i.hasNext()) + { + Item item = i.next(); + Player player = _thrown.get(item); + + if (player.equals(event.getEntity())) + { + i.remove(); + item.remove(); + } + } + } + + @Override + public void Reset(Player player) + { + Iterator i = _thrown.keySet().iterator(); + + while (i.hasNext()) + { + Item item = i.next(); + Player thrower = _thrown.get(item); + + if (player.equals(thrower)) + { + i.remove(); + item.remove(); + } + } + } +} diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java new file mode 100644 index 000000000..10e364d40 --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java @@ -0,0 +1,146 @@ +package mineplex.minecraft.game.classcombat.Skill.Mage; + +import java.util.HashMap; + +import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType; +import mineplex.core.common.util.F; +import mineplex.core.common.util.NautHashMap; +import mineplex.core.common.util.UtilBlock; +import mineplex.core.common.util.UtilEnt; +import mineplex.core.common.util.UtilFirework; +import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilParticle; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilParticle.ParticleType; +import mineplex.minecraft.game.classcombat.Skill.SkillChargeSword; +import mineplex.minecraft.game.classcombat.Skill.SkillFactory; +import mineplex.minecraft.game.core.damage.CustomDamageEvent; + +import org.bukkit.Color; +import org.bukkit.Location; +import org.bukkit.Sound; +import org.bukkit.FireworkEffect.Type; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; + +public class StaticLazer extends SkillChargeSword +{ + public StaticLazer(SkillFactory skills, String name, + ClassType classType, SkillType skillType, + int cost, int maxLevel) + { + super(skills, name, classType, skillType, cost, maxLevel, + 0.012f, 0.008f, + 12000, -1000, true, true, + false, true); + + SetDesc(new String[] + { + "Hold Block to charge static electricity.", + "Release Block to fire static lazer.", + "", + GetChargeString(), + "Taking damage cancels charge.", + "", + "Deals up to #7#1 damage and travels", + "up to #20#10 blocks.", + }); + + _fireOnFull = true; + setAchievementSkill(true); + } + + @Override + public String GetRechargeString() + { + return "Recharge: " + "#12#-1 Seconds"; + } + + @Override + public void DoSkillCustom(Player player, float charge) + { + int level = getLevel(player); + if (level <= 0) + return; + + //Action + double curRange = 0; + while (curRange <= 20 + 10 * level) + { + Location newTarget = player.getEyeLocation().add(player.getLocation().getDirection().multiply(curRange)); + + //Hit Player + HashMap hits = UtilEnt.getInRadius(newTarget, 2); + hits.remove(player); + if (!hits.isEmpty()) + break; + + //Hit Block + if (!UtilBlock.airFoliage(newTarget.getBlock())) + break; + + //Progress Forwards + curRange += 0.2; + + //Smoke Trail + UtilParticle.PlayParticle(ParticleType.FIREWORKS_SPARK, newTarget, 0, 0, 0, 0, 1); + } + + //Destination + Location target = player.getLocation().add(player.getLocation().getDirection().multiply(curRange)); + + UtilParticle.PlayParticle(ParticleType.EXPLODE, target, 0, 0, 0, 0, 1); + + //Firework + UtilFirework.playFirework(player.getLocation().add(player.getLocation().getDirection().multiply(Math.max(0, curRange - 0.6))), Type.BURST, Color.WHITE, false, false); + + HashMap hit = UtilEnt.getInRadius(target.subtract(0, 1, 0), 6); + for (LivingEntity other : hit.keySet()) + { + if (other.equals(player)) + continue; + + //Damage Event + Factory.Damage().NewDamageEvent(other, player, null, + DamageCause.CUSTOM, (2 + (5 + level) * hit.get(other)) * charge, true, true, false, + player.getName(), GetName()); + + } + + //Inform + UtilPlayer.message(player, F.main(GetClassType().name(), "You used " + F.skill(GetName(getLevel(player))) + ".")); + + //Effect + player.getWorld().playSound(player.getEyeLocation(), Sound.ZOMBIE_REMEDY, 0.5f + player.getExp(), 1.75f - charge); + } + + @EventHandler(priority = EventPriority.NORMAL) + public void damageCancelCharge(CustomDamageEvent event) + { + if (event.IsCancelled()) + return; + + //Damagee + Player damagee = event.GetDamageePlayer(); + if (damagee == null) return; + + if (_charge.remove(damagee) == null) + return; + + //Inform + UtilPlayer.message(damagee, F.main(GetClassType().name(), F.skill(GetName()) + " was interrupted.")); + + //Effect + damagee.getWorld().playSound(damagee.getLocation(), Sound.ZOMBIE_REMEDY, 0.5f, 3f); + + } + + @Override + public void Reset(Player player) + { + _charge.remove(player); + } +} diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java new file mode 100644 index 000000000..fafc9bbc0 --- /dev/null +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java @@ -0,0 +1,254 @@ +package mineplex.minecraft.game.classcombat.Skill.Ranger; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; + + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.entity.Projectile; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.block.Action; +import org.bukkit.event.entity.EntityShootBowEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.entity.ProjectileHitEvent; + +import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilAction; +import mineplex.core.common.util.UtilAlg; +import mineplex.core.common.util.UtilParticle; +import mineplex.core.updater.event.UpdateEvent; +import mineplex.core.updater.UpdateType; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilParticle.ParticleType; +import mineplex.minecraft.game.classcombat.Skill.SkillActive; +import mineplex.minecraft.game.classcombat.Skill.SkillFactory; +import mineplex.minecraft.game.core.damage.CustomDamageEvent; + +public class ExplosiveShot extends SkillActive +{ + private HashSet _arrows = new HashSet(); + private HashSet _active = new HashSet(); + + public ExplosiveShot(SkillFactory skills, String name, ClassType classType, SkillType skillType, + int cost, int levels, + int energy, int energyMod, + long recharge, long rechargeMod, boolean rechargeInform, + Material[] itemArray, + Action[] actionArray) + { + super(skills, name, classType, skillType, + cost, levels, + energy, energyMod, + recharge, rechargeMod, rechargeInform, + itemArray, + actionArray); + + SetDesc(new String[] + { + "Prepare an explosive shot;", + "Your next arrow will explode on", + "impact, dealing up to 10 damage", + "and knockback. ", + " ", + "Explosion radius of #4.5#0.5", + }); + + setAchievementSkill(true); + } + + @Override + public boolean CustomCheck(Player player, int level) + { + if (player.getLocation().getBlock().getTypeId() == 8 || player.getLocation().getBlock().getTypeId() == 9) + { + UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); + return false; + } + + return true; + } + + @Override + public void Skill(Player player, int level) + { + //Action + _active.add(player); + + //Inform + UtilPlayer.message(player, F.main(GetClassType().name(), "You prepared " + F.skill(GetName(level)) + ".")); + + //Effect + player.getWorld().playSound(player.getLocation(), Sound.BLAZE_BREATH, 2.5f, 2.0f); + } + + @EventHandler + public void BowShoot(EntityShootBowEvent event) + { + if (!(event.getEntity() instanceof Player)) + return; + + if (!(event.getProjectile() instanceof Arrow)) + return; + + Player player = (Player)event.getEntity(); + + if (!_active.remove(player)) + return; + + //Inform + UtilPlayer.message(player, F.main(GetClassType().name(), "You fired " + F.skill(GetName(getLevel(player))) + ".")); + + _arrows.add((Arrow)event.getProjectile()); + } + + @EventHandler(priority = EventPriority.HIGH) + public void hitEntityTrigger(CustomDamageEvent event) + { + if (event.IsCancelled()) + return; + + if (event.GetCause() != DamageCause.PROJECTILE) + return; + + Projectile projectile = event.GetProjectile(); + if (projectile == null) + return; + + if (!_arrows.remove(event.GetProjectile())) + return; + + event.SetCancelled(GetName()); + + Location loc = event.GetDamageeEntity().getLocation().subtract(event.GetProjectile().getVelocity().normalize().multiply(0.1)); + + trigger((Arrow)event.GetProjectile(), loc); + } + + @EventHandler + public void hitBlockTrigger(ProjectileHitEvent event) + { + Projectile proj = event.getEntity(); + + if (!_arrows.contains(proj)) + return; + + if (proj.getShooter() == null) + return; + + if (!(proj.getShooter() instanceof Player)) + return; + + Player damager = (Player)proj.getShooter(); + int level = getLevel(damager); + if (level == 0) return; + + final Arrow arrow = (Arrow)proj; + + Factory.GetPlugin().getServer().getScheduler().scheduleSyncDelayedTask(Factory.GetPlugin(), new Runnable() + { + public void run() + { + try + { + //If it hasnt already triggered (via damage) + if (_arrows.remove(arrow)) + trigger(arrow, arrow.getLocation()); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + }, 0); + + //Remove + proj.remove(); + } + + @EventHandler + public void cleanTrigger(UpdateEvent event) + { + if (event.getType() != UpdateType.SEC) + return; + + for (Iterator arrowIterator = _arrows.iterator(); arrowIterator.hasNext();) + { + Arrow arrow = arrowIterator.next(); + + if (arrow.isDead() || !arrow.isValid() || arrow.isOnGround() || arrow.getTicksLived() > 60) + { + arrowIterator.remove(); + trigger(arrow, arrow.getLocation()); + } + } + } + + public void trigger(Arrow arrow, Location loc) + { + if (arrow == null) + return; + + if (arrow.getShooter() == null || !(arrow.getShooter() instanceof Player)) + { + arrow.remove(); + return; + } + + Player player = (Player)arrow.getShooter(); + + //Level + int level = getLevel(player); + if (level == 0) + return; + + //Velocity Players + HashMap hitMap = UtilPlayer.getInRadius(loc, 4.5 + (level * 0.5)); + for (Player cur : hitMap.keySet()) + { + double range = hitMap.get(cur); + + //Condition + Factory.Condition().Factory().Falling(GetName(), cur, player, 6, false, true); + + //Damage Event + Factory.Damage().NewDamageEvent(cur, player, null, + DamageCause.CUSTOM, 10 * range, false, true, false, + player.getName(), GetName()); + + //Velocity + UtilAction.velocity(cur, UtilAlg.getTrajectory2d(loc, cur.getLocation().add(0, 1, 0)), + 0.4 + 1 * range, false, 0, 0.2 + 0.6 * range, 1.2, true); + + //Inform + if (cur instanceof Player) + UtilPlayer.message((Player)cur, F.main(GetClassType().name(), F.name(player.getName()) +" hit you with " + F.skill(GetName(level)) + ".")); + } + + UtilParticle.PlayParticle(ParticleType.HUGE_EXPLOSION, loc, 0, 0, 0, 0, 1); + loc.getWorld().playSound(loc, Sound.EXPLODE, 2f, 0.75f); + } + + @EventHandler + public void particle(UpdateEvent event) + { + if (event.getType() != UpdateType.TICK) + return; + + for (Entity ent : _arrows) + UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, ent.getLocation(), 0, 0, 0, 0, 1); + } + + @Override + public void Reset(Player player) + { + _active.remove(player); + } +} diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Longshot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Longshot.java index 362cf8b90..43e143944 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Longshot.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Longshot.java @@ -50,8 +50,6 @@ public class Longshot extends Skill //Save _arrows.put(event.getProjectile(), event.getProjectile().getLocation()); - - System.out.println("FIRING!"); } @EventHandler(priority = EventPriority.HIGH) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java index 4fcfe8660..368abd7ed 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java @@ -48,8 +48,8 @@ public class NapalmShot extends SkillActive SetDesc(new String[] { "Prepare a napalm shot;", - "Your next arrow will explode on", - "impact, releasing #8#8 flames." + "Your next arrow will burst into", + "#8#8 flames on impact." }); } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java index cd71c98bf..bfed3327b 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java @@ -39,6 +39,8 @@ public abstract class Skill implements ISkill, Listener private boolean _free; private NautHashMap _users; + + private boolean _isAchievementSkill = false; public SkillFactory Factory; @@ -327,4 +329,15 @@ public abstract class Skill implements ISkill, Listener { } + + public void setAchievementSkill(boolean var) + { + _isAchievementSkill = var; + } + + @Override + public boolean isAchievementSkill() + { + return _isAchievementSkill; + } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillCharge.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillCharge.java index 1b2313335..2825c5f93 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillCharge.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillCharge.java @@ -13,7 +13,7 @@ public class SkillCharge extends Skill protected float _rateBase; protected float _rateBoost; - + public SkillCharge(SkillFactory skills, String name, ClassType classType, SkillType skillType, int cost, int maxLevel, float base, float boost) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillChargeSword.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillChargeSword.java index 82968c07c..0e9ccaccd 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillChargeSword.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillChargeSword.java @@ -5,7 +5,9 @@ import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType; +import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent; +import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -21,6 +23,8 @@ public abstract class SkillChargeSword extends SkillCharge implements Listener protected boolean _rechargeInform = false; protected boolean _rechargeAttach = false; + protected boolean _fireOnFull = false; + public SkillChargeSword(SkillFactory skills, String name, ClassType classType, SkillType skillType, int cost, int maxLevel, float base, float boost, @@ -56,13 +60,31 @@ public abstract class SkillChargeSword extends SkillCharge implements Listener if (!_canChargeInWater && cur.getLocation().getBlock().isLiquid()) continue; + //Check Allowed + SkillTriggerEvent triggerEvent = new SkillTriggerEvent(cur, GetName(), GetClassType()); + Bukkit.getServer().getPluginManager().callEvent(triggerEvent); + + if (triggerEvent.IsCancelled()) + continue; + //Recharged Check (uses recharge upon activation) if (!_charge.containsKey(cur)) if (!Recharge.Instance.usable(cur, GetName())) continue; //Charge - Charge(cur); + if (Charge(cur) && _fireOnFull) + { + //Action + float charge = _charge.remove(cur); + + //Set Recharge + Recharge.Instance.recharge(cur, GetName()); + Recharge.Instance.use(cur, GetName(), _recharge + (getLevel(cur) * _rechargePerLevel), true, true); + + DoSkill(cur, charge); + } + } //Release Charge else if (_charge.containsKey(cur)) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java index bff765694..8862b10b0 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java @@ -167,13 +167,13 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory 0, 0, true, new Material[] {Material.IRON_SWORD, Material.GOLD_SWORD, Material.DIAMOND_SWORD}, new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); -// -// AddSkill(new Illusion(this, "Illusion", ClassType.Assassin, SkillType.Sword, -// 1, 4, -// 30, -5, -// 0, 0, true, -// new Material[] {Material.IRON_SWORD, Material.GOLD_SWORD, Material.DIAMOND_SWORD}, -// new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); + + AddSkill(new Illusion(this, "Illusion", ClassType.Assassin, SkillType.Sword, + 1, 4, + 50, -4, + 20000, -1000, true, + new Material[] {Material.IRON_SWORD, Material.GOLD_SWORD, Material.DIAMOND_SWORD}, + new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); //Axe AddSkill(new Blink(this, "Blink", ClassType.Assassin, SkillType.Axe, @@ -257,7 +257,7 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory AddSkill(new SeismicSlam(this, "Seismic Slam", ClassType.Brute, SkillType.Axe, 1, 5, 0, 0, - 30000, -3000, true, + 30000, -2000, true, new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); @@ -327,6 +327,13 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory 8000, -1000, true, new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); + + AddSkill(new AxeThrow(this, "Roped Axe Throw", ClassType.Knight, SkillType.Axe, + 1, 5, + 0, 0, + 3000, -450, true, + new Material[] {Material.IRON_AXE, Material.GOLD_AXE, Material.DIAMOND_AXE}, + new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); //Passive A @@ -366,6 +373,8 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory new Material[] {Material.IRON_SWORD, Material.GOLD_SWORD, Material.DIAMOND_SWORD}, new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); + AddSkill(new StaticLazer(this, "Static Lazer", ClassType.Mage, SkillType.Sword, 1, 5)); + //Axe AddSkill(new FireBlast(this, "Fire Blast", ClassType.Mage, SkillType.Axe, 1, 5, @@ -491,6 +500,13 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory 10000, -1500, false, new Material[] {Material.BOW}, new Action[] {Action.LEFT_CLICK_AIR, Action.LEFT_CLICK_BLOCK})); + + AddSkill(new ExplosiveShot(this, "Explosive Arrow", ClassType.Ranger, SkillType.Bow, + 1, 4, + 0, 0, + 20000, -2000, false, + new Material[] {Material.BOW}, + new Action[] {Action.LEFT_CLICK_AIR, Action.LEFT_CLICK_BLOCK})); //Passive A AddSkill(new Barrage(this, "Barrage", ClassType.Ranger, SkillType.PassiveA, 1, 3)); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java index 05b905b05..e359386c5 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassShopManager.java @@ -4,8 +4,10 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.MiniPlugin; +import mineplex.core.account.CoreClientManager; import mineplex.core.achievement.Achievement; import mineplex.core.achievement.AchievementManager; +import mineplex.core.common.Rank; import mineplex.minecraft.game.classcombat.Class.ClassManager; import mineplex.minecraft.game.classcombat.Skill.SkillFactory; import mineplex.minecraft.game.classcombat.item.ItemFactory; @@ -16,15 +18,17 @@ public class ClassShopManager extends MiniPlugin private SkillFactory _skillFactory; private ItemFactory _itemFactory; private AchievementManager _achievementManager; + private CoreClientManager _clientManager; - public ClassShopManager(JavaPlugin plugin, ClassManager classManager, SkillFactory skillFactory, ItemFactory itemFactory) + public ClassShopManager(JavaPlugin plugin, ClassManager classManager, SkillFactory skillFactory, ItemFactory itemFactory, AchievementManager achievementManager, CoreClientManager clientManager) { super("Class Shop Manager", plugin); _classManager = classManager; _skillFactory = skillFactory; _itemFactory = itemFactory; - //_achievementManager = achievementManager; + _achievementManager = achievementManager; + _clientManager = clientManager; } public ClassManager GetClassManager() @@ -44,6 +48,9 @@ public class ClassShopManager extends MiniPlugin public boolean hasAchievements(Player player) { + if (_clientManager.Get(player).GetRank().Has(Rank.MODERATOR)) + return true; + return _achievementManager.hasCategory(player, new Achievement[] { Achievement.CHAMPIONS_ACE, diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/SkillPage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/SkillPage.java index f43574395..38a184ef9 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/SkillPage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/SkillPage.java @@ -216,7 +216,8 @@ public class SkillPage extends ShopPageBase { List skillLore = new ArrayList(); - boolean locked = isSkillLocked(skill); + boolean achievementLocked = skill.isAchievementSkill() && !Plugin.hasAchievements(Player); + boolean locked = isSkillLocked(skill) || achievementLocked; Material material = locked ? Material.EMERALD : (clientClass.GetSavingCustomBuild().hasSkill(skill) ? Material.WRITTEN_BOOK : Material.BOOK); boolean hasSkill = clientClass.GetSavingCustomBuild().hasSkill(skill); int level = hasSkill ? clientClass.GetSavingCustomBuild().getLevel(skill) : 1; @@ -224,7 +225,7 @@ public class SkillPage extends ShopPageBase ChatColor.RESET + C.Bold + " - " + ChatColor.GREEN + C.Bold + "Level " + (hasSkill ? level : 0) + "/" + skill.getMaxLevel()); - if (locked) + if (locked && !skill.isAchievementSkill()) { skillLore.add(C.cYellow + skill.GetGemCost() + " Gems"); skillLore.add(C.cBlack); @@ -247,7 +248,7 @@ public class SkillPage extends ShopPageBase if (hasSkill) skillLore.add(C.cGreen + "Left-Click to Upgrade to Level " + (level + 1)); else - skillLore.add(C.cGreen + "Left-Click to Select"); + skillLore.add(C.cGreen + "Left-Click to " + (locked && !achievementLocked ? "Purchase" : "Select")); } else { @@ -266,9 +267,21 @@ public class SkillPage extends ShopPageBase } - ShopItem skillItem = new ShopItem(material, name, skillLore.toArray(new String[skillLore.size()]), level, locked, true); + ShopItem skillItem = null; + + if (achievementLocked) + { + skillLore.add(C.cGray + " "); + skillLore.add(C.cPurple + "To use this skill, you must have all"); + skillLore.add(C.cPurple + "Champions Achievements unlocked!"); + skillItem = new ShopItem(Material.DIAMOND, (byte)0, name, skillLore.toArray(new String[skillLore.size()]), level, achievementLocked, true); + } + else + skillItem = new ShopItem(material, name, skillLore.toArray(new String[skillLore.size()]), level, locked, true); - if (locked) + if (achievementLocked) + AddItem(slotNumber, skillItem); + else if (locked) AddButton(slotNumber, skillItem, new PurchaseSkillButton(this, skill)); else AddButton(slotNumber, skillItem, new SelectSkillButton(this, skill, Math.min((hasSkill ? level + 1 : level), skill.getMaxLevel()), clientClass.GetSavingCustomBuild().SkillTokens >= skill.GetTokenCost())); diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java index 6853cf62e..9cd1b4542 100644 --- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java +++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java @@ -44,6 +44,7 @@ public class ServerCommandManager */ private void initialize() { + /* CAUSING STUTTER LAG IN HUBS final Jedis jedis = _jedisPool.getResource(); // Spin up a new thread and subscribe to the Redis pubsub network @@ -67,30 +68,37 @@ public class ServerCommandManager }); thread.start(); + */ } /** * Publish a {@link ServerCommand} across the network to all live servers. * @param serverCommand - the {@link ServerCommand} to issue to all servers. */ - public void publishCommand(ServerCommand serverCommand) + public void publishCommand(final ServerCommand serverCommand) { - Jedis jedis = _jedisPool.getResource(); - - try + new Thread(new Runnable() { - String commandType = serverCommand.getClass().getSimpleName(); - String serializedCommand = Utility.serialize(serverCommand); - jedis.publish(SERVER_COMMANDS_CHANNEL + ":" + commandType, serializedCommand); - } - catch (Exception exception) - { - exception.printStackTrace(); - } - finally - { - _jedisPool.returnResource(jedis); - } + public void run() + { + Jedis jedis = _jedisPool.getResource(); + + try + { + String commandType = serverCommand.getClass().getSimpleName(); + String serializedCommand = Utility.serialize(serverCommand); + jedis.publish(SERVER_COMMANDS_CHANNEL + ":" + commandType, serializedCommand); + } + catch (Exception exception) + { + exception.printStackTrace(); + } + finally + { + _jedisPool.returnResource(jedis); + } + } + }).start(); } /** diff --git a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java index 921859a76..8a6aac201 100644 --- a/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java +++ b/Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java @@ -186,6 +186,9 @@ public class ServerMonitor for (ServerGroup serverGroup : serverGroups) { + if (serverGroup.getName().equals("Testing")) + continue; + handleGroupChanges(dedicatedServers, serverTracker, serverGroup, false); } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java index 2ddfe47e4..26100ffc2 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java @@ -57,7 +57,7 @@ public class StaffServer extends JavaPlugin new MemoryFix(this); new FileUpdater(this, portal); - new CustomerSupport(this, clientManager, donationManager, new SalesPackageManager(this, clientManager, donationManager, new InventoryManager(this), new StatsManager(this))); + new CustomerSupport(this, clientManager, donationManager, new SalesPackageManager(this, clientManager, donationManager, new InventoryManager(this, clientManager), new StatsManager(this, clientManager))); new Password(this, serverStatusManager.getCurrentServerName()); //Updates diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/BoosterCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/BoosterCommand.java index aaeee75a9..231d64b49 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/BoosterCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/BoosterCommand.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; +import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UUIDFetcher; import mineplex.staffServer.salespackage.SalesPackageManager; @@ -18,18 +19,26 @@ public class BoosterCommand extends CommandBase } @Override - public void Execute(Player caller, String[] args) + public void Execute(final Player caller, String[] args) { if (args == null || args.length != 2) return; - String playerName = args[0]; - int amount = Integer.parseInt(args[1]); + final String playerName = args[0]; + final int amount = Integer.parseInt(args[1]); UUID uuid = UUIDFetcher.getUUIDOf(playerName); Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, uuid, "Gem Booster " + amount, false, 0, false); - Plugin.getInventoryManager().addItemToInventoryForOffline(uuid.toString(), "Utility", "Gem Booster", amount); - caller.sendMessage(F.main(Plugin.getName(), "Added " + amount + " boosters to " + playerName + "'s account!")); + Plugin.getInventoryManager().addItemToInventoryForOffline(new Callback() + { + public void run(Boolean success) + { + if (success) + caller.sendMessage(F.main(Plugin.getName(), "Added " + amount + " boosters to " + playerName + "'s account!")); + else + caller.sendMessage(F.main(Plugin.getName(), "There was an error adding " + amount + " boosters to " + playerName + "'s account!")); + } + }, uuid.toString(), "Utility", "Gem Booster", amount); } } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureChestCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureChestCommand.java index 8f49792ae..55363cb09 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureChestCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureChestCommand.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; +import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UUIDFetcher; import mineplex.staffServer.salespackage.SalesPackageManager; @@ -18,18 +19,27 @@ public class TreasureChestCommand extends CommandBase } @Override - public void Execute(Player caller, String[] args) + public void Execute(final Player caller, String[] args) { if (args == null || args.length != 2) return; - String playerName = args[0]; - int amount = Integer.parseInt(args[1]); + final String playerName = args[0]; + final int amount = Integer.parseInt(args[1]); UUID uuid = UUIDFetcher.getUUIDOf(playerName); Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, uuid, "Treasure Chest " + amount, false, 0, false); - Plugin.getInventoryManager().addItemToInventoryForOffline(uuid.toString(), "Utility", "Treasure Chest", amount); - caller.sendMessage(F.main(Plugin.getName(), "Added " + amount + " treasure chests to " + playerName + "'s account!")); + Plugin.getInventoryManager().addItemToInventoryForOffline(new Callback() + { + public void run(Boolean success) + { + if (success) + caller.sendMessage(F.main(Plugin.getName(), "Added " + amount + " treasure chests to " + playerName + "'s account!")); + else + caller.sendMessage(F.main(Plugin.getName(), "There was an error adding " + amount + " treasure chests to " + playerName + "'s account!")); + } + }, uuid.toString(), "Utility", "Treasure Chest", amount); + } } diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureKeyCommand.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureKeyCommand.java index 077b4fc28..b3cde9224 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureKeyCommand.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/TreasureKeyCommand.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; +import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UUIDFetcher; import mineplex.staffServer.salespackage.SalesPackageManager; @@ -18,18 +19,26 @@ public class TreasureKeyCommand extends CommandBase } @Override - public void Execute(Player caller, String[] args) + public void Execute(final Player caller, String[] args) { if (args == null || args.length != 2) return; - String playerName = args[0]; - int amount = Integer.parseInt(args[1]); + final String playerName = args[0]; + final int amount = Integer.parseInt(args[1]); UUID uuid = UUIDFetcher.getUUIDOf(playerName); Plugin.getDonationManager().PurchaseUnknownSalesPackage(null, playerName, uuid, "Treasure Key " + amount, false, 0, false); - Plugin.getInventoryManager().addItemToInventoryForOffline(uuid.toString(), "Treasure", "Treasure Key", amount); - caller.sendMessage(F.main(Plugin.getName(), "Added " + amount + " treasure Keys to " + playerName + "'s account!")); + Plugin.getInventoryManager().addItemToInventoryForOffline(new Callback() + { + public void run(Boolean success) + { + if (success) + caller.sendMessage(F.main(Plugin.getName(), "Added " + amount + " treasure Keys to " + playerName + "'s account!")); + else + caller.sendMessage(F.main(Plugin.getName(), "There was an error adding " + amount + " treasure Keys to " + playerName + "'s account!")); + } + }, uuid.toString(), "Treasure", "Treasure Key", amount); } } 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 1694f058a..9fb628e9c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -9,7 +9,6 @@ import net.minecraft.server.v1_7_R4.MinecraftServer; import mineplex.core.CustomTagFix; 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; @@ -21,6 +20,7 @@ import mineplex.core.disguise.DisguiseManager; import mineplex.core.donation.DonationManager; import mineplex.core.friend.FriendManager; import mineplex.core.gadget.GadgetManager; +import mineplex.core.hologram.HologramManager; import mineplex.core.inventory.InventoryManager; import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.logger.Logger; @@ -64,7 +64,7 @@ public class Arcade extends JavaPlugin { //Delete Old Games Folders DeleteFolders(); - + //Configs getConfig().addDefault(WEB_CONFIG, "http://accounts.mineplex.com/"); getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG)); @@ -89,7 +89,6 @@ public class Arcade extends JavaPlugin PreferencesManager preferenceManager = new PreferencesManager(this, _clientManager, _donationManager); new MessageManager(this, _clientManager, preferenceManager); - AntiStack antistack = new AntiStack(this); Creature creature = new Creature(this); Spawn spawn = new Spawn(this); Teleport teleport = new Teleport(this, _clientManager, spawn); @@ -109,9 +108,10 @@ public class Arcade extends JavaPlugin BlockRestore blockRestore = new BlockRestore(this); ProjectileManager projectileManager = new ProjectileManager(this); + HologramManager hologramManager = new HologramManager(this); //Inventory - InventoryManager inventoryManager = new InventoryManager(this); + InventoryManager inventoryManager = new InventoryManager(this, _clientManager); PetManager petManager = new PetManager(this, _clientManager, _donationManager, creature, webServerAddress); MountManager mountManager = new MountManager(this, _clientManager, _donationManager, blockRestore, disguiseManager); GadgetManager gadgetManager = new GadgetManager(this, _clientManager, _donationManager, inventoryManager, mountManager, petManager, preferenceManager, disguiseManager, blockRestore, projectileManager); @@ -119,7 +119,7 @@ public class Arcade extends JavaPlugin cosmeticManager.setInterfaceSlot(7); //Arcade Manager - _gameManager = new ArcadeManager(this, serverStatusManager, ReadServerConfig(), _clientManager, _donationManager, _damageManager, disguiseManager, creature, teleport, new Blood(this), antistack, portal, preferenceManager, inventoryManager, packetHandler, cosmeticManager, projectileManager, petManager, webServerAddress); + _gameManager = new ArcadeManager(this, serverStatusManager, ReadServerConfig(), _clientManager, _donationManager, _damageManager, disguiseManager, creature, teleport, new Blood(this), portal, preferenceManager, inventoryManager, packetHandler, cosmeticManager, projectileManager, petManager, hologramManager, webServerAddress); new MemoryFix(this); new CustomTagFix(this, packetHandler); 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 4747ac36e..0cf2d80a8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -36,7 +36,6 @@ import org.bukkit.event.server.ServerListPingEvent; import mineplex.core.MiniPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.achievement.AchievementManager; -import mineplex.core.antistack.AntiStack; import mineplex.core.blockrestore.BlockRestore; import mineplex.core.blood.Blood; import mineplex.core.chat.Chat; @@ -55,6 +54,7 @@ import mineplex.core.donation.DonationManager; import mineplex.core.elo.EloManager; import mineplex.core.energy.Energy; import mineplex.core.explosion.Explosion; +import mineplex.core.hologram.HologramManager; import mineplex.core.inventory.InventoryManager; import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.movement.Movement; @@ -116,7 +116,6 @@ import nautilus.game.arcade.shop.ArcadeShop; public class ArcadeManager extends MiniPlugin implements IRelation { // Modules - private AntiStack _antistack; private BlockRestore _blockRestore; private Blood _blood; private Chat _chat; @@ -147,7 +146,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation private InventoryManager _inventoryManager; private CosmeticManager _cosmeticManager; private final IdleManager _idleManager; - + private HologramManager _hologramManager; private AchievementManager _achievementManager; private StatsManager _statsManager; private ClassManager _classManager; @@ -173,17 +172,15 @@ public class ArcadeManager extends MiniPlugin implements IRelation public ArcadeManager(Arcade plugin, ServerStatusManager serverStatusManager, GameServerConfig serverConfig, CoreClientManager clientManager, DonationManager donationManager, DamageManager damageManager, - DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, AntiStack antistack, + DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, Portal portal, PreferencesManager preferences, InventoryManager inventoryManager, PacketHandler packetHandler, - CosmeticManager cosmeticManager, ProjectileManager projectileManager, PetManager petManager, String webAddress) + CosmeticManager cosmeticManager, ProjectileManager projectileManager, PetManager petManager, HologramManager hologramManager, String webAddress) { super("Game Manager", plugin); _serverConfig = serverConfig; // Modules - _antistack = antistack; - _blockRestore = new BlockRestore(plugin); _blood = blood; @@ -219,26 +216,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation _projectileManager = projectileManager; - if (serverConfig.GameList.contains(GameType.ChampionsDominate) - || serverConfig.GameList.contains(GameType.ChampionsTDM) - || serverConfig.GameList.contains(GameType.ChampionsMOBA)) - { - Energy energy = new Energy(plugin); - ItemFactory itemFactory = new ItemFactory(_plugin, _blockRestore, _conditionManager, damageManager, energy, - _fire, _projectileManager, webAddress); - _skillFactory = new SkillFactory(plugin, damageManager, this, _damageManager.GetCombatManager(), - _conditionManager, _projectileManager, _disguiseManager, _blockRestore, _fire, new Movement(plugin), teleport, - energy, webAddress); - _classManager = new ClassManager(plugin, clientManager, donationManager, _skillFactory, itemFactory, - webAddress); - - _classShopManager = new ClassShopManager(_plugin, _classManager, _skillFactory, itemFactory); - _classShop = new ClassCombatShop(_classShopManager, clientManager, donationManager, webAddress); - - _eloManager = new EloManager(_plugin); - } - - _statsManager = new StatsManager(plugin); + _statsManager = new StatsManager(plugin, clientManager); _taskManager = new TaskManager(plugin, webAddress); _achievementManager = new AchievementManager(_statsManager, clientManager, donationManager); _inventoryManager = inventoryManager; @@ -267,6 +245,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation new GameSpectatorManager(this); _gameWorldManager = new GameWorldManager(this); new MiscManager(this); + _hologramManager = hologramManager; _idleManager = new IdleManager(this); //new HalloweenManager(this); @@ -275,6 +254,25 @@ public class ArcadeManager extends MiniPlugin implements IRelation new CompassAddon(plugin, this); new SoupAddon(plugin, this); new TeamArmorAddon(plugin, this); + + if (serverConfig.GameList.contains(GameType.ChampionsDominate) + || serverConfig.GameList.contains(GameType.ChampionsTDM) + || serverConfig.GameList.contains(GameType.ChampionsMOBA)) + { + Energy energy = new Energy(plugin); + ItemFactory itemFactory = new ItemFactory(_plugin, _blockRestore, _conditionManager, damageManager, energy, + _fire, _projectileManager, webAddress); + _skillFactory = new SkillFactory(plugin, damageManager, this, _damageManager.GetCombatManager(), + _conditionManager, _projectileManager, _disguiseManager, _blockRestore, _fire, new Movement(plugin), teleport, + energy, webAddress); + _classManager = new ClassManager(plugin, clientManager, donationManager, _skillFactory, itemFactory, + webAddress); + + _classShopManager = new ClassShopManager(_plugin, _classManager, _skillFactory, itemFactory, _achievementManager, clientManager); + _classShop = new ClassCombatShop(_classShopManager, clientManager, donationManager, webAddress); + + _eloManager = new EloManager(_plugin, clientManager); + } } @Override @@ -300,11 +298,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation return _achievementManager; } - public AntiStack GetAntiStack() - { - return _antistack; - } - public Blood GetBlood() { return _blood; @@ -344,6 +337,11 @@ public class ArcadeManager extends MiniPlugin implements IRelation { return _disguiseManager; } + + public HologramManager getHologramManager() + { + return _hologramManager; + } public DamageManager GetDamage() { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index c3832eae2..c89318c7c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -14,6 +14,7 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.block.BlockFace; +import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.Entity; import org.bukkit.entity.Hanging; @@ -33,6 +34,7 @@ import org.bukkit.event.hanging.HangingPlaceEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerLoginEvent; +import org.bukkit.event.world.WorldLoadEvent; import org.bukkit.scoreboard.Objective; import org.bukkit.util.Vector; @@ -203,6 +205,7 @@ public abstract class Game implements Listener public boolean RepairWeapons = true; + private double _itemMergeRadius = 0; public boolean AnnounceStay = true; public boolean AnnounceJoinQuit = true; @@ -227,11 +230,11 @@ public abstract class Game implements Listener public boolean SoupEnabled = true; public boolean TeamArmor = false; - public boolean TeamArmorHotbar = false; + public boolean TeamArmorHotbar = false; - public boolean GiveClock = true; + public boolean GiveClock = true; - public boolean AllowParticles = true; + public boolean AllowParticles = true; public double GemMultiplier = 1; public boolean GemHunterEnabled = true; @@ -1286,8 +1289,34 @@ public abstract class Game implements Listener loc.getY() >= WorldData.MaxY || loc.getY() <= WorldData.MinY); } - - - - + + public void setItemMerge(boolean itemMerge) + { + setItemMergeRadius(itemMerge ? 3.5 : 0); + } + + public void setItemMergeRadius(double mergeRadius) + { + _itemMergeRadius = mergeRadius; + + if (WorldData.World != null) + { + ((CraftWorld) WorldData.World).getHandle().spigotConfig.itemMerge = _itemMergeRadius; + } + } + + public double getItemMergeRadius() + { + return _itemMergeRadius; + } + + @EventHandler + public void applyItemMerge(WorldLoadEvent event) + { + if (event.getWorld().getName().equals(WorldData.GetFolder())) + { + System.out.println("Setting item merge radius for game to " + _itemMergeRadius); + ((CraftWorld) event.getWorld()).getHandle().spigotConfig.itemMerge = _itemMergeRadius; + } + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/BaconBrawl.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/BaconBrawl.java index bcd38eebf..475b6452e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/BaconBrawl.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/BaconBrawl.java @@ -5,6 +5,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import mineplex.core.common.util.UtilPlayer; +import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java index 6a5e58ac8..38b385611 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java @@ -1010,22 +1010,14 @@ public class Bridge extends TeamGame implements OreObsfucation "Cannot place blocks this high up.")); event.setCancelled(true); return; - } - - //Under Water - if (event.getBlock().getRelative(BlockFace.UP).isLiquid()) - { - UtilPlayer.message(event.getPlayer(), F.main("Game", - "Cannot place blocks under liquids.")); - event.setCancelled(true); - return; - } + } if (_bridgesDown) return; - + //In Liquid - if (event.getBlockReplacedState().getTypeId() == 8 || + if (event.getBlock().getRelative(BlockFace.UP).isLiquid() || + event.getBlockReplacedState().getTypeId() == 8 || event.getBlockReplacedState().getTypeId() == 9 || event.getBlockReplacedState().getTypeId() == 10 || event.getBlockReplacedState().getTypeId() == 11) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java index 05ce9e450..1db46cd74 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java @@ -100,6 +100,9 @@ public class Dragons extends SoloGame for (Item item : _sparkler.GetItems()) { + if (item.getLocation().getY() < 4 || item.getLocation().getBlock().isLiquid()) + continue; + for (DragonData data : _dragons.values()) { if (UtilMath.offset(data.Location, item.getLocation()) < 48) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java index b0fe440c1..ebf0bf3a5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java @@ -521,7 +521,7 @@ public class HideSeek extends TeamGame { if (event.getType() != UpdateType.TICK) return; - + if (!InProgress()) return; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java index af94a2e98..cd0eb796a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java @@ -60,7 +60,7 @@ public class Micro extends TeamGame this.BlockBreak = true; this.BlockPlace = true; - registerStatTrackers(new KillsWithinGameStatTracker(this, 12, "Annihilation")); + registerStatTrackers(new KillsWithinGameStatTracker(this, 8, "Annihilation")); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java index d80ae53d5..59e6eeb5a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java @@ -57,7 +57,6 @@ import org.bukkit.scoreboard.Team; import org.bukkit.scoreboard.TeamNameTagVisibility; import org.bukkit.util.Vector; -import mineplex.core.antistack.AntiStack; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAction; @@ -381,30 +380,30 @@ public class MineStrike extends TeamGame ((CraftPlayer) event.getEntity()).getHandle().spectating = true; } - public void disguiseSneak(Player player, GameTeam team) - { - //Create Disguise - if (!_disguise.containsKey(player)) - { - _disguise.put(player, new DisguisePlayer(player, ((CraftPlayer)player).getProfile())); - } - - DisguisePlayer disguise = _disguise.get(player); - disguise.setSneaking(true); - Manager.GetDisguise().disguise(_disguise.get(player)); - - for (Player other : UtilServer.getPlayers()) - { - if (team.HasPlayer(other)) - { - Manager.GetDisguise().removeViewerToDisguise(disguise, other); - } - else - { - Manager.GetDisguise().addViewerToDisguise(disguise, other); - } - } - } +// public void disguiseSneak(Player player, GameTeam team) +// { +// //Create Disguise +// if (!_disguise.containsKey(player)) +// { +// _disguise.put(player, new DisguisePlayer(player, ((CraftPlayer)player).getProfile())); +// } +// +// DisguisePlayer disguise = _disguise.get(player); +// disguise.setSneaking(true); +// Manager.GetDisguise().disguise(_disguise.get(player)); +// +// for (Player other : UtilServer.getPlayers()) +// { +// if (team.HasPlayer(other)) +// { +// Manager.GetDisguise().removeViewerToDisguise(disguise, other); +// } +// else +// { +// Manager.GetDisguise().addViewerToDisguise(disguise, other, true); +// } +// } +// } public void giveTeamArmor(Player player, Color color) { @@ -898,8 +897,6 @@ public class MineStrike extends TeamGame if (UtilInv.contains(event.getPlayer(), Material.SHEARS, (byte)0, 1)) return; - AntiStack.removeUID(event.getItem()); - event.getPlayer().getInventory().setItem(8, event.getItem().getItemStack()); UtilPlayer.message(event.getPlayer(), F.main("Game", "You equipped Defusal Kit.")); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java index 29356c629..90e5dd9ad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java @@ -99,7 +99,6 @@ public class Paintball extends TeamGame } private HashMap _doubles = new HashMap(); - private HashSet _water = new HashSet(); public Paintball(ArcadeManager manager) { @@ -127,7 +126,7 @@ public class Paintball extends TeamGame new KillFastStatTracker(this, 4, 5, "KillingSpree"), new WinWithoutLosingTeammateStatTracker(this, "FlawlessVictory"), new MedicStatTracker(this), - new WinFastStatTracker(this, 20, "Speedrunner"), + new WinFastStatTracker(this, 30, "Speedrunner"), new LastStandStatTracker(this) ); } @@ -334,7 +333,7 @@ public class Paintball extends TeamGame player.setVelocity(new Vector(0,1.2,0)); - _doubles.put(player, new PlayerCopy(this, player)); + _doubles.put(player, new PlayerCopy(this, player, GetTeam(player).GetColor())); } // @EventHandler diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java index 213e30650..b072dea9a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java @@ -3,21 +3,23 @@ package nautilus.game.arcade.game.games.paintball; import mineplex.core.common.util.C; import mineplex.core.common.util.UtilEnt; import mineplex.core.disguise.disguises.DisguisePlayer; +import nautilus.game.arcade.game.Game; import org.bukkit.ChatColor; import org.bukkit.EntityEffect; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.entity.Skeleton; public class PlayerCopy { - private Paintball Host; + private Game Host; private Skeleton _ent; private Player _owner; - public PlayerCopy(Paintball host, Player owner) + public PlayerCopy(Game host, Player owner, ChatColor nameColor) { Host = host; @@ -34,12 +36,12 @@ public class PlayerCopy //Armor _ent.getEquipment().setArmorContents(owner.getInventory().getArmorContents()); - _ent.setCustomName(C.cWhite + C.Bold + C.Scramble + "XX" + ChatColor.RESET + " " + host.GetTeam(owner).GetColor() + owner.getName() + " " + C.cWhite + C.Bold + C.Scramble + "XX"); + _ent.setCustomName(C.cWhite + C.Bold + C.Scramble + "XX" + ChatColor.RESET + " " + nameColor + owner.getName() + " " + C.cWhite + C.Bold + C.Scramble + "XX"); _ent.setCustomNameVisible(true); //Disguise - ////DisguisePlayer disguise = new DisguisePlayer(_ent, owner.getName()); - //Host.Manager.GetDisguise().disguise(disguise); +// DisguisePlayer disguise = new DisguisePlayer(_ent, ((CraftPlayer)owner).getProfile()); +// Host.Manager.GetDisguise().disguise(disguise); } public LivingEntity GetEntity() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java index 107a0ef9b..e6ffa73cb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java @@ -78,6 +78,8 @@ public class Quiver extends SoloGame this.BlockBreakAllow.add(102); this.BlockBreakAllow.add(20); + this.DeathSpectateSecs = 4; + _scoreObj = Scoreboard.GetScoreboard().registerNewObjective("Kills", "dummy"); _scoreObj.setDisplaySlot(DisplaySlot.BELOW_NAME); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/Runner.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/Runner.java index 11850201d..08fc0da42 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/Runner.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/Runner.java @@ -127,6 +127,8 @@ public class Runner extends SoloGame implements IThrown return; _blocks.put(block, System.currentTimeMillis()); + + block.setTypeIdAndData(159, (byte) 14, false); } @EventHandler @@ -178,61 +180,9 @@ public class Runner extends SoloGame implements IThrown while (blockIterator.hasNext()) { Block block = blockIterator.next(); - -// if (!UtilTime.elapsed(_blocks.get(block), 120)) -// continue; - - blockIterator.remove(); - - //Degrade - if (block.getTypeId() == 98) - { - if (block.getData() == 0) - { - readd.add(block); - block.setData((byte)2); - continue; - } - } - - //Degrade - if (block.getTypeId() == 35 || block.getTypeId() == 159) - { - if (block.getData() == 3) - { - readd.add(block); - block.setData((byte)5); - continue; - } - - if (block.getData() == 5) - { - readd.add(block); - block.setData((byte)4); - continue; - } - - if (block.getData() == 4) - { - readd.add(block); - block.setData((byte)1); - continue; - } - - if (block.getData() == 1) - { - readd.add(block); - block.setData((byte)14); - continue; - } - - else if (block.getData() != 14) - { - readd.add(block); - block.setData((byte)3); - continue; - } - } + + if (!UtilTime.elapsed(_blocks.get(block), 600)) + continue; //Fall int id = block.getTypeId(); @@ -240,13 +190,78 @@ public class Runner extends SoloGame implements IThrown MapUtil.QuickChangeBlockAt(block.getLocation(), Material.AIR); FallingBlock ent = block.getWorld().spawnFallingBlock(block.getLocation(), id, data); Manager.GetProjectile().AddThrow(ent, null, this, -1, true, false, false, false, 1d); + + blockIterator.remove(); } - - //Re-add - for (Block block : readd) - { - _blocks.put(block, System.currentTimeMillis()); - } +// +//// if (!UtilTime.elapsed(_blocks.get(block), 120)) +//// continue; +// +// blockIterator.remove(); +// +// //Degrade +// if (block.getTypeId() == 98) +// { +// if (block.getData() == 0) +// { +// readd.add(block); +// block.setData((byte)2); +// continue; +// } +// } +// +// //Degrade +// if (block.getTypeId() == 35 || block.getTypeId() == 159) +// { +// if (block.getData() == 3) +// { +// readd.add(block); +// block.setData((byte)5); +// continue; +// } +// +// if (block.getData() == 5) +// { +// readd.add(block); +// block.setData((byte)4); +// continue; +// } +// +// if (block.getData() == 4) +// { +// readd.add(block); +// block.setData((byte)1); +// continue; +// } +// +// if (block.getData() == 1) +// { +// readd.add(block); +// block.setData((byte)14); +// continue; +// } +// +// else if (block.getData() != 14) +// { +// readd.add(block); +// block.setData((byte)3); +// continue; +// } +// } +// +// //Fall +// int id = block.getTypeId(); +// byte data = block.getData(); +// MapUtil.QuickChangeBlockAt(block.getLocation(), Material.AIR); +// FallingBlock ent = block.getWorld().spawnFallingBlock(block.getLocation(), id, data); +// Manager.GetProjectile().AddThrow(ent, null, this, -1, true, false, false, false, 1d); +// } +// +// //Re-add +// for (Block block : readd) +// { +// _blocks.put(block, System.currentTimeMillis()); +// } } @EventHandler diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java index 162adbeda..ef28ec4bb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java @@ -151,6 +151,8 @@ public class SheepGame extends TeamGame this.TeamArmor = true; this.TeamArmorHotbar = true; + + this.DeathSpectateSecs = 4; registerStatTrackers( new SheepThiefStatTracker(this), diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java index ed8aef2ad..1cd31fe34 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java @@ -87,8 +87,10 @@ public class SuperSmash extends SoloGame this.CompassEnabled = true; + this.DeathSpectateSecs = 6; + this.SpawnDistanceRequirement = 16; - + // Add stat table here // Example //Manager.GetStatsManager().addTable("SuperSmashMobStats", "Kills", "Deaths", "Wins", "Losses"); @@ -374,16 +376,15 @@ public class SuperSmash extends SoloGame @EventHandler(priority = EventPriority.MONITOR) public void HungerRestore(CustomDamageEvent event) { - if (event.IsCancelled()) return; - if (event.GetDamagerPlayer(true) == null) - return; - Player damager = event.GetDamagerPlayer(true); if (damager == null) return; + + if (damager.equals(event.GetDamageeEntity())) + return; if (!Recharge.Instance.use(damager, "Hunger Restore", 250, false, false)) return; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/Snake.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/Snake.java index ea2fe353f..699c3ae15 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/Snake.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/Snake.java @@ -151,7 +151,7 @@ public class Snake extends SoloGame this.GemMultiplier = 0.5; registerStatTrackers( - new KillsWithinGameStatTracker(this, 8, "Cannibal"), + new KillsWithinGameStatTracker(this, 6, "Cannibal"), new ChooChooStatTracker(this), new SlimySheepStatTracker(this) ); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java index 0f90adf98..9f1719883 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesTeams.java @@ -149,7 +149,8 @@ public class SurvivalGamesTeams extends TeamGame C.cAqua + "Compass finds Players during day time.", }; - Manager.GetAntiStack().SetEnabled(false); + setItemMerge(true); +// Manager.GetAntiStack().SetEnabled(false); this.GameTimeout = 9600000; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java index 491429b3d..d67fd7969 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java @@ -134,6 +134,7 @@ public class TurfForts extends TeamGame this.ItemDrop = false; this.ItemPickup = false; this.DamageSelf = false; + this.DeathSpectateSecs = 4; registerStatTrackers( new BlockShreadStatTracker(this), diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java index b7e4f87d1..ab74aa916 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java @@ -174,7 +174,8 @@ public class UHC extends TeamGame Manager.GetCreature().SetDisableCustomDrops(true); //Disable Anti-Stack - Manager.GetAntiStack().SetEnabled(false); + setItemMerge(true); +// Manager.GetAntiStack().SetEnabled(false); //Damage Settings Manager.GetDamage().SetEnabled(false); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java index dea7b7783..038033d3d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java @@ -6,13 +6,23 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.EntityEffect; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; +import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.entity.ThrownPotion; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityCombustEvent; +import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.potion.PotionEffectType; import org.bukkit.util.Vector; import mineplex.core.common.util.C; @@ -22,12 +32,15 @@ import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTextMiddle; import mineplex.core.common.util.UtilTime; import mineplex.core.data.BlockData; import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; +import mineplex.minecraft.game.core.condition.Condition.ConditionType; +import mineplex.minecraft.game.core.damage.CustomDamageEvent; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; @@ -35,6 +48,9 @@ import nautilus.game.arcade.events.PlayerDeathOutEvent; import nautilus.game.arcade.events.PlayerKitGiveEvent; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.TeamGame; +import nautilus.game.arcade.game.GameTeam.PlayerState; +import nautilus.game.arcade.game.games.paintball.PlayerCopy; +import nautilus.game.arcade.game.games.paintball.Paintball.ReviveEvent; import nautilus.game.arcade.game.games.wither.kit.*; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.NullKit; @@ -44,15 +60,17 @@ public class WitherGame extends TeamGame implements IBlockRestorer { private GameTeam _runners; private GameTeam _withers; - + private double _witherFactor = 2.5; private int _yLimit = 0; private long _gameTime = 300000; - private int _livesPerPlayer = 3; - private HashMap _lives = new HashMap(); + private HashMap _doubles = new HashMap(); + +// private int _livesPerPlayer = 3; +// private HashMap _lives = new HashMap(); private HashSet _blocks = new HashSet(); @@ -62,9 +80,10 @@ public class WitherGame extends TeamGame implements IBlockRestorer new Kit[] { - //new KitHumanRunner(manager), new KitHumanArcher(manager), - new KitHumanBuilder(manager), + //new KitHumanBuilder(manager), + //new KitHumanRunner(manager), + new NullKit(manager), new NullKit(manager), new NullKit(manager), new KitWitherMinion(manager), @@ -75,8 +94,8 @@ public class WitherGame extends TeamGame implements IBlockRestorer new String[] { - C.cGreen + "Humans" + C.cWhite + " Find Armor Upgrades to help surive!", - C.cGreen + "Humans" + C.cWhite + " 5 Lives per Player", + C.cGreen + "Humans" + C.cWhite + " Run and hide from the Withers", + C.cGreen + "Humans" + C.cWhite + " Revive your dead allies!", C.cGreen + "Humans" + C.cWhite + " Win by surviving for 5 minutes", " ", C.cRed + "Withers" + C.cWhite + " Moves very slowly when near ground", @@ -95,6 +114,9 @@ public class WitherGame extends TeamGame implements IBlockRestorer this.KitRegisterState = GameState.Prepare; + this.TeamArmor = true; + this.TeamArmorHotbar = false; + _help = new String[] { C.cRed + C.Bold + "This game is in early stages of development!", @@ -164,15 +186,17 @@ public class WitherGame extends TeamGame implements IBlockRestorer public void setWither(Player player, boolean forced) { - _lives.remove(player); +// _lives.remove(player); SetPlayerTeam(player, _withers, true); - + //Kit Kit newKit = GetKits()[4]; SetKit(player, newKit, false); newKit.ApplyKit(player); + + player.teleport(_withers.GetSpawn()); if (forced) { @@ -185,25 +209,25 @@ public class WitherGame extends TeamGame implements IBlockRestorer } } - @EventHandler - public void playerDead(final PlayerDeathOutEvent event) - { - Player player = event.GetPlayer(); - - if (_lives.containsKey(player)) - { - int lives = _lives.get(player); - - if (lives <= 1) - return; - - _lives.put(player, lives - 1); - - UtilPlayer.message(player, F.main("Game", "You have " + F.elem(C.cGreen + C.Bold + lives + " Lives Remaining") + ".")); - - event.setCancelled(true); - } - } +// @EventHandler +// public void playerLoseLife(final PlayerDeathOutEvent event) +// { +// Player player = event.GetPlayer(); +// +// if (_lives.containsKey(player)) +// { +// int lives = _lives.get(player); +// +// if (lives <= 1) +// return; +// +// _lives.put(player, lives - 1); +// +// UtilPlayer.message(player, F.main("Game", "You have " + F.elem(C.cGreen + C.Bold + lives + " Lives Remaining") + ".")); +// +// event.setCancelled(true); +// } +// } @EventHandler public void gameStart(GameStateChangeEvent event) @@ -211,31 +235,31 @@ public class WitherGame extends TeamGame implements IBlockRestorer if (event.GetState() != GameState.Live) return; - UtilTextMiddle.display(C.cGreen + "Humans Hiding", "12 Seconds until Assault", 10, 80, 10); + UtilTextMiddle.display(C.cGreen + "Humans Hiding", "15 Seconds until Assault", 10, 80, 10); for (Player player : _withers.GetPlayers(true)) { - Manager.GetCondition().Factory().Blind("Game Start", player, null, 12, 0, false, false, false); + Manager.GetCondition().Factory().Blind("Game Start", player, null, 15, 0, false, false, false); } } - @EventHandler - public void playerLivesDisplay(PlayerKitGiveEvent event) - { - if (!_runners.HasPlayer(event.GetPlayer())) - return; - - //Player Lives - if (!_lives.containsKey(event.GetPlayer())) - _lives.put(event.GetPlayer(), _livesPerPlayer); - - int lives = _lives.get(event.GetPlayer()); - - if (lives <= 0) - return; - - event.GetPlayer().getInventory().setItem(8, ItemStackFactory.Instance.CreateStack(Material.BONE, (byte)0, lives, C.cGreen + C.Bold + lives + " Lives Remaining")); - } +// @EventHandler +// public void playerLivesDisplay(PlayerKitGiveEvent event) +// { +// if (!_runners.HasPlayer(event.GetPlayer())) +// return; +// +// //Player Lives +// if (!_lives.containsKey(event.GetPlayer())) +// _lives.put(event.GetPlayer(), _livesPerPlayer); +// +// int lives = _lives.get(event.GetPlayer()); +// +// if (lives <= 0) +// return; +// +// event.GetPlayer().getInventory().setItem(8, ItemStackFactory.Instance.CreateStack(Material.BONE, (byte)0, lives, C.cGreen + C.Bold + lives + " Lives Remaining")); +// } @Override public void EndCheck() @@ -292,9 +316,9 @@ public class WitherGame extends TeamGame implements IBlockRestorer if (event.getType() != UpdateType.FAST) return; - int lives = 0; - for (int i : _lives.values()) - lives += i; +// int lives = 0; +// for (int i : _lives.values()) +// lives += i; //Wipe Last Scoreboard.Reset(); @@ -307,9 +331,9 @@ public class WitherGame extends TeamGame implements IBlockRestorer Scoreboard.Write(_withers.GetColor() + C.Bold + _withers.GetName()); Scoreboard.Write(_withers.GetColor() + "" + _withers.GetPlayers(true).size() + " Players"); - Scoreboard.WriteBlank(); - Scoreboard.Write(C.cYellow + C.Bold + "Human Lives"); - Scoreboard.Write(lives + " / " + (_lives.size() * _livesPerPlayer)); +// Scoreboard.WriteBlank(); +// Scoreboard.Write(C.cYellow + C.Bold + "Humans Alive"); +// Scoreboard.Write(lives + " / " + (_lives.size() * _livesPerPlayer)); Scoreboard.WriteBlank(); Scoreboard.Write(C.cYellow + C.Bold + "Time Left"); @@ -357,13 +381,13 @@ public class WitherGame extends TeamGame implements IBlockRestorer ArrayList collisions = new ArrayList(); //Fly Speed - double speed = 0.06 - (_yLimit - player.getLocation().getY()) * 0.075; + double speed = 0.09 - (_yLimit - player.getLocation().getY()) * 0.006; if (speed > 0.16) speed = 0.16; - if (speed < 0.015) - speed = 0.015; + if (speed < 0.016) + speed = 0.016; player.setFlySpeed((float)speed); @@ -431,29 +455,227 @@ public class WitherGame extends TeamGame implements IBlockRestorer } } +// @EventHandler +// public void cleanLives(PlayerQuitEvent event) +// { +// _lives.remove(event.getPlayer()); +// } + +// @EventHandler +// public void livesUpdate(UpdateEvent event) +// { +// if (!IsLive()) +// return; +// +// if (event.getType() != UpdateType.FASTER) +// return; +// +// Iterator playerIter = _lives.keySet().iterator(); +// +// while (playerIter.hasNext()) +// { +// Player player = playerIter.next(); +// +// if (!player.isOnline() || !_runners.HasPlayer(player)) +// playerIter.remove(); +// } +// } + @EventHandler - public void playerQuit(PlayerQuitEvent event) + public void arrowDamage(CustomDamageEvent event) { - _lives.remove(event.getPlayer()); + if (event.GetProjectile() == null) + return; + + event.AddMult(GetName(), "Arrow Mod", 0.75, false); + } + + @EventHandler(priority = EventPriority.HIGHEST) + public void damageOut(CustomDamageEvent event) + { + if (event.IsCancelled()) + return; + + if (event.GetDamageePlayer() == null) + return; + + if (event.GetDamage() < event.GetDamageePlayer().getHealth()) + return; + + event.SetCancelled("Fake Death"); + + event.GetDamageePlayer().playEffect(EntityEffect.HURT); + + playerOut(event.GetDamageePlayer()); + + if (event.GetDamagerPlayer(true) != null) + { + AddGems(event.GetDamagerPlayer(true), 2, "Humans Stunned", true); + + Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cGreen + event.GetDamageePlayer().getName() + C.cGray + " was killed by " + C.cRed + event.GetDamagerPlayer(true).getName() + C.cGray + "."); + } + else + { + Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cGreen + event.GetDamageePlayer().getName() + C.cGray + " was killed."); + } + } + + public void playerOut(Player player) + { + //State + SetPlayerState(player, PlayerState.OUT); + player.setHealth(20); + + player.setFlySpeed(0.1f); + + //Conditions + Manager.GetCondition().Factory().Blind("Hit", player, player, 1.5, 0, false, false, false); + Manager.GetCondition().Factory().Cloak("Hit", player, player, 9999, false, false); + + //Settings + player.setGameMode(GameMode.CREATIVE); + player.setFlying(true); + ((CraftPlayer)player).getHandle().spectating = true; + ((CraftPlayer)player).getHandle().k = false; + + player.setVelocity(new Vector(0,1.2,0)); + + _doubles.put(player, new PlayerCopy(this, player, ChatColor.YELLOW)); + } + + public void playerIn(final Player player, final LivingEntity copy) + { + //State + SetPlayerState(player, PlayerState.IN); + player.setHealth(20); + + //Teleport + if (copy != null) + { + Location loc = player.getLocation(); + loc.setX(copy.getLocation().getX()); + loc.setY(copy.getLocation().getY()); + loc.setZ(copy.getLocation().getZ()); + player.teleport(loc); + } + + //Settings + player.setGameMode(GameMode.SURVIVAL); + player.setFlying(false); + ((CraftPlayer)player).getHandle().spectating = false; + ((CraftPlayer)player).getHandle().k = true; + + //Items + player.getInventory().remove(Material.WATCH); + player.getInventory().remove(Material.COMPASS); + + //Inform + UtilPlayer.message(player, F.main("Game", "You have been revived!")); + + //Delayed Visibility + if (copy != null) + { + UtilServer.getServer().getScheduler().scheduleSyncDelayedTask(Manager.GetPlugin(), new Runnable() + { + public void run() + { + //Remove Invis + if (IsAlive(player)) + Manager.GetCondition().EndCondition(player, ConditionType.CLOAK, null); + + //Remove Copy + copy.remove(); + } + }, 4); + } } @EventHandler - public void livesUpdate(UpdateEvent event) + public void revive(ProjectileHitEvent event) { if (!IsLive()) return; - if (event.getType() != UpdateType.FASTER) + if (!(event.getEntity() instanceof ThrownPotion)) + return; + + if (event.getEntity().getShooter() == null) + return; + + if (!(event.getEntity().getShooter() instanceof Player)) + return; + + Player thrower = (Player)event.getEntity().getShooter(); + + GameTeam throwerTeam = GetTeam(thrower); + if (throwerTeam == null) return; + + //Revive + Iterator copyIterator = _doubles.values().iterator(); + while (copyIterator.hasNext()) + { + PlayerCopy copy = copyIterator.next(); + + GameTeam otherTeam = GetTeam(copy.GetPlayer()); + if (otherTeam == null || !otherTeam.equals(throwerTeam)) + continue; + + if (UtilMath.offset(copy.GetEntity().getLocation().add(0,1,0), event.getEntity().getLocation()) > 3) + continue; + + playerIn(copy.GetPlayer(), copy.GetEntity()); + copyIterator.remove(); + + AddGems(thrower, 3, "Revived Ally", true); + } + + //Revive + for (Player player : GetPlayers(true)) + { + GameTeam otherTeam = GetTeam(player); + if (otherTeam == null || !otherTeam.equals(throwerTeam)) + continue; + + if (UtilMath.offset(player.getLocation().add(0,1,0), event.getEntity().getLocation()) > 3) + continue; + + playerIn(player, null); + } + } + + @EventHandler + public void removePotionEffect(UpdateEvent event) + { + if (event.getType() != UpdateType.TICK) return; - Iterator playerIter = _lives.keySet().iterator(); - - while (playerIter.hasNext()) + for (Player player : GetPlayers(true)) + player.removePotionEffect(PotionEffectType.WATER_BREATHING); + } + + @EventHandler + public void skeletonDamage(CustomDamageEvent event) + { + for (PlayerCopy copy : _doubles.values()) { - Player player = playerIter.next(); - - if (!player.isOnline() || !_runners.HasPlayer(player)) - playerIter.remove(); + if (copy.GetEntity().equals(event.GetDamageeEntity())) + { + event.SetCancelled("Runner Copy Cancel"); + break; + } + } + } + + @EventHandler + public void skeletonCombust(EntityCombustEvent event) + { + for (PlayerCopy copy : _doubles.values()) + { + if (copy.GetEntity().equals(event.getEntity())) + { + event.setCancelled(true); + break; + } } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanArcher.java index 73ef95176..a5a0c065d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanArcher.java @@ -1,15 +1,21 @@ package nautilus.game.arcade.game.games.wither.kit; +import org.bukkit.ChatColor; import org.bukkit.Material; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.PotionMeta; +import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.itemstack.ItemStackFactory; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.Perk; +import nautilus.game.arcade.kit.perks.PerkDoubleJump; import nautilus.game.arcade.kit.perks.PerkFletcher; import nautilus.game.arcade.kit.perks.PerkRopedArrow; import nautilus.game.arcade.kit.perks.PerkWitherArrowBlind; @@ -27,8 +33,8 @@ public class KitHumanArcher extends Kit new Perk[] { - new PerkRopedArrow("Roped Arrow", 1, 4000), - new PerkWitherArrowBlind(3), + new PerkDoubleJump("Double Jump", 1, 0.8, true, 4000, true), + new PerkWitherArrowBlind(6), new PerkFletcher(4, 4, true), }, @@ -42,10 +48,15 @@ public class KitHumanArcher extends Kit { player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD)); player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW)); + + ItemStack potion = new ItemStack(Material.POTION, 2, (short)16429); // 16422 + PotionMeta potionMeta = (PotionMeta)potion.getItemMeta(); + potionMeta.setDisplayName(ChatColor.RESET + "Revival Potion"); + potion.setItemMeta(potionMeta); + player.getInventory().addItem(potion); + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP)); player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP)); - - Manager.GetCondition().Factory().Invulnerable("Spawn Invul", player, player, 6, false, false); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanBuilder.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanBuilder.java index b4920e54f..d6c168aa4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanBuilder.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanBuilder.java @@ -1,16 +1,22 @@ package nautilus.game.arcade.game.games.wither.kit; +import org.bukkit.ChatColor; import org.bukkit.Material; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.PotionMeta; +import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.itemstack.ItemStackFactory; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.perks.PerkBlockRestorer; +import nautilus.game.arcade.kit.perks.PerkDoubleJump; import nautilus.game.arcade.kit.perks.PerkIronShell; public class KitHumanBuilder extends Kit @@ -26,6 +32,7 @@ public class KitHumanBuilder extends Kit new Perk[] { + new PerkDoubleJump("Double Jump", 1, 0.8, true, 6000, true), new PerkIronShell(), new PerkBlockRestorer() }, @@ -39,10 +46,15 @@ public class KitHumanBuilder extends Kit { player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_AXE)); player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SPADE)); + + ItemStack potion = new ItemStack(Material.POTION, 2, (short)16429); // 16422 + PotionMeta potionMeta = (PotionMeta)potion.getItemMeta(); + potionMeta.setDisplayName(ChatColor.RESET + "Revival Potion"); + potion.setItemMeta(potionMeta); + player.getInventory().addItem(potion); + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP)); player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP)); - - Manager.GetCondition().Factory().Invulnerable("Spawn Invul", player, player, 6, false, false); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanRunner.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanRunner.java index 485cbac84..5e2edb58b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanRunner.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitHumanRunner.java @@ -1,24 +1,29 @@ package nautilus.game.arcade.game.games.wither.kit; +import org.bukkit.ChatColor; import org.bukkit.Material; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.PotionMeta; import mineplex.core.common.util.C; +import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.itemstack.ItemStackFactory; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.Perk; +import nautilus.game.arcade.kit.perks.PerkDoubleJump; import nautilus.game.arcade.kit.perks.PerkLeap; public class KitHumanRunner extends Kit { public KitHumanRunner(ArcadeManager manager) { - super(manager, "Human Leaper", KitAvailability.Free, + super(manager, "Human Jumper", KitAvailability.Free, new String[] { @@ -27,7 +32,7 @@ public class KitHumanRunner extends Kit new Perk[] { - new PerkLeap("Leap", 1, 1, 4000) + new PerkDoubleJump("Double Jump", 1, 0.8, true, 6000, true), }, EntityType.ZOMBIE, null); @@ -38,10 +43,15 @@ public class KitHumanRunner extends Kit public void GiveItems(Player player) { player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_AXE)); + + ItemStack potion = new ItemStack(Material.POTION, 2, (short)16429); // 16422 + PotionMeta potionMeta = (PotionMeta)potion.getItemMeta(); + potionMeta.setDisplayName(ChatColor.RESET + "Revival Potion"); + potion.setItemMeta(potionMeta); + player.getInventory().addItem(potion); + player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP)); player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.MUSHROOM_SOUP)); - - Manager.GetCondition().Factory().Invulnerable("Spawn Invul", player, player, 6, false, false); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java index fe3df5c2c..891929068 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java @@ -38,26 +38,28 @@ public class KitWitherMinion extends Kit new PerkWitherAttack(), new PerkWitherMinion() }, - EntityType.SKELETON, + EntityType.WITHER, null); } - @Override - public void SpawnCustom(LivingEntity ent) - { - ent.setMaxHealth(300); - ent.setHealth(300); - - DisguiseWither disguise = new DisguiseWither(ent); - disguise.SetName(C.cYellow + "Wither"); - disguise.SetCustomNameVisible(true); - Manager.GetDisguise().disguise(disguise); - } +// @Override +// public void SpawnCustom(LivingEntity ent) +// { +// ent.setMaxHealth(300); +// ent.setHealth(300); +// +// DisguiseWither disguise = new DisguiseWither(ent); +// disguise.SetName(C.cYellow + "Wither"); +// disguise.SetCustomNameVisible(true); +// Manager.GetDisguise().disguise(disguise); +// } + + @Override public void GiveItems(Player player) - { + { player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1, C.cYellow + C.Bold + "Left-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Wither Skull")); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSparkler.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSparkler.java index 6f32b72d4..90c19a6c9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSparkler.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSparkler.java @@ -181,7 +181,7 @@ public class PerkSparkler extends Perk @EventHandler public void Sparkle(UpdateEvent event) { - if (event.getType() != UpdateType.FASTER) + if (event.getType() != UpdateType.FAST) return; Iterator itemIterator = _items.iterator(); @@ -197,7 +197,7 @@ public class PerkSparkler extends Perk continue; } - UtilFirework.playFirework(item.getLocation(), Type.BURST, Color.GREEN, false, false); + UtilFirework.playFirework(item.getLocation(), Type.BURST, Color.YELLOW, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherArrowBlind.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherArrowBlind.java index 6073b0d51..0349b6fb5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherArrowBlind.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherArrowBlind.java @@ -96,21 +96,21 @@ public class PerkWitherArrowBlind extends Perk boolean hit = false; for (Player player : getWitherTeam().GetPlayers(true)) { - if (UtilMath.offset(player.getLocation().add(0, 1, 0), arrow.getLocation()) < _proximityHit) + if (UtilMath.offset(player.getLocation().add(0, 3, 0), arrow.getLocation()) < _proximityHit) { Manager.GetCondition().Factory().Blind(GetName(), player, null, 4, 0, false, false, false); - - UtilParticle.PlayParticle(ParticleType.HUGE_EXPLOSION, arrow.getLocation(), 0, 0, 0, 0, 1); - - arrowIterator.remove(); - arrow.remove(); hit = true; - continue; } } if (hit) + { + UtilParticle.PlayParticle(ParticleType.HUGE_EXPLOSION, arrow.getLocation(), 0, 0, 0, 0, 1); + arrowIterator.remove(); + arrow.remove(); continue; + } + } //Dead diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherArrows.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherArrows.java index ed4732d48..bf21b8aff 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherArrows.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherArrows.java @@ -41,13 +41,13 @@ public class PerkWitherArrows extends Perk if (!player.isBlocking()) { - player.setExp((float) Math.min(0.999, player.getExp()+(1f/30f))); + player.setExp((float) Math.min(0.999, player.getExp()+(1f/20f))); } else if (player.getExp() > 0) { - player.setExp((float) Math.max(0, player.getExp()-(1f/30f))); + player.setExp((float) Math.max(0, player.getExp()-(1f/20f))); - for (int i=0 ; i<1 ; i++) + for (int i=0 ; i<2 ; i++) { Arrow arrow = player.getWorld().spawnArrow( player.getEyeLocation().add(player.getLocation().getDirection()), diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherAttack.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherAttack.java index 32aecef65..e8e02149d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherAttack.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkWitherAttack.java @@ -137,7 +137,7 @@ public class PerkWitherAttack extends Perk double scale = 0.4 + 0.6 * Math.min(1, skull.getTicksLived()/20d); //Players - HashMap players = UtilPlayer.getInRadius(skull.getLocation(), 6); + HashMap players = UtilPlayer.getInRadius(skull.getLocation(), 7); for (Player player : players.keySet()) { if (!Manager.GetGame().IsAlive(player)) @@ -145,7 +145,7 @@ public class PerkWitherAttack extends Perk //Damage Event Manager.GetDamage().NewDamageEvent(player, (LivingEntity)skull.getShooter(), null, - DamageCause.CUSTOM, 8 * players.get(player) * scale, true, true, false, + DamageCause.CUSTOM, 2 + 10 * players.get(player) * scale, true, true, false, UtilEnt.getName((LivingEntity)skull.getShooter()), GetName()); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java index a7a6ce2cc..5ab646033 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java @@ -159,7 +159,7 @@ public class GameCreationManager implements Listener Manager.GetDamage().SetEnabled(true); Manager.GetExplosion().SetRegenerate(false); Manager.GetExplosion().SetTNTSpread(true); - Manager.GetAntiStack().SetEnabled(true); +// Manager.GetAntiStack().SetEnabled(true); Manager.getCosmeticManager().setHideParticles(false); HashMap pastTeams = null; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java index b6f1430be..164645c4b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java @@ -108,7 +108,7 @@ public class GameGemManager implements Listener if (event.GetState() != PlayerState.OUT) return; - if (event.GetGame().GetType() == GameType.Paintball || event.GetGame().GetType() == GameType.MineStrike) + if (event.GetGame().GetType() == GameType.WitherAssault || event.GetGame().GetType() == GameType.Paintball || event.GetGame().GetType() == GameType.MineStrike) return; RewardGems(event.GetGame(), event.GetPlayer(), false); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLootManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLootManager.java index 3dc93b055..3be91efe2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLootManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLootManager.java @@ -60,6 +60,9 @@ public class GameLootManager implements Listener //Chest _rewardManager.addReward(new InventoryReward(_rewardManager, Manager.getInventoryManager(), "Treasure Chest", "Treasure Chest", 1, 1, new ItemStack(Material.CHEST), RewardRarity.COMMON, 4)); + + _rewardManager.addReward(new InventoryReward(_rewardManager, Manager.getInventoryManager(), "Treasure Chest", "Treasure Chest", 1, 2, + new ItemStack(Material.CHEST), RewardRarity.COMMON, 1)); //Key _rewardManager.addReward(new InventoryReward(_rewardManager, Manager.getInventoryManager(), "Treasure Key", "Treasure Key", 1, 1, diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java index dceef7794..3d79b0f97 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java @@ -129,7 +129,7 @@ public class MiscManager implements Listener @EventHandler public void HubCommand(PlayerCommandPreprocessEvent event) { - if (event.getMessage().startsWith("/hub") || event.getMessage().startsWith("/leave")) + if (event.getMessage().startsWith("/lobby") || event.getMessage().startsWith("/hub") || event.getMessage().startsWith("/leave")) { Manager.GetPortal().SendPlayerToServer(event.getPlayer(), "Lobby"); event.setCancelled(true); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java index b1e5c7536..1f64962ad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java @@ -23,6 +23,7 @@ import org.bukkit.Difficulty; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.WorldCreator; +import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; import org.bukkit.event.world.ChunkUnloadEvent; public class WorldData @@ -84,7 +85,7 @@ public class WorldData TimingManager.stop("WorldData loading world."); World.setDifficulty(Difficulty.HARD); - + TimingManager.start("WorldData loading WorldConfig."); //Load World Data worldData.LoadWorldConfig(); @@ -116,7 +117,7 @@ public class WorldData return File; } - protected String GetFolder() + public String GetFolder() { if (Folder == null) Folder = "Game" + Id + "_" + Host.GetName() + "_" + GetFile();