From 567b501dfb5567ccad1e8fcfed5c98193ea28bdf Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Sat, 23 Sep 2017 03:41:43 -0400 Subject: [PATCH] Fixed merge conflicts --- .../core/common/util/UtilCollections.java | 6 ++-- .../mineplex/core/common/util/UtilEnt.java | 31 ++++++++++--------- .../community/CommunityJoinRequestsPage.java | 6 ++-- .../gui/community/CommunityMembersPage.java | 6 ++-- .../gui/community/CommunitySettingsPage.java | 8 ++--- .../src/mineplex/core/hologram/Hologram.java | 28 ++++++++--------- .../core/leaderboard/LeaderboardManager.java | 2 +- .../src/mineplex/core/stats/StatsManager.java | 2 +- .../game/clans/clans/ClansManager.java | 2 +- .../game/clans/clans/mounts/MountManager.java | 2 +- .../game/clans/clans/siege/SiegeManager.java | 10 +++--- .../clans/clans/siege/outpost/Outpost.java | 18 ++++++----- .../clans/siege/outpost/OutpostManager.java | 22 +++++++------ .../game/clans/clans/siege/weapon/Cannon.java | 12 ++++--- .../clans/clans/siege/weapon/SiegeWeapon.java | 2 +- .../clans/worldevent/raid/RaidAltar.java | 8 ++--- .../clans/worldevent/raid/WorldData.java | 2 +- .../game/clans/shop/pvp/tnt/TNTGenPage.java | 7 +++-- .../clans/objective/goals/HoldItemGoal.java | 8 ++--- .../goals/fields/IdentifyFieldsGoal.java | 13 ++++---- .../clans/repository/TutorialRepository.java | 14 +++++---- .../SalesAnnouncementManager.java | 4 +-- .../SalesAnnouncementManager.java | 4 +-- .../SalesAnnouncementRepository.java | 4 +-- .../Skill/Ranger/Sharpshooter.java | 11 ++++--- .../games/castleassault/CastleAssaultTDM.java | 4 +-- .../castleassault/kits/PerkBloodlust.java | 4 +-- .../game/games/minestrike/items/guns/Gun.java | 19 +++++++----- .../stattrackers/PerfectionistTracker.java | 6 ++-- .../tutorial/TutorialValentines.java | 4 +-- .../game/arcade/managers/GameHostManager.java | 2 +- 31 files changed, 143 insertions(+), 128 deletions(-) diff --git a/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/UtilCollections.java b/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/UtilCollections.java index 1c41ffe51..c0f41b86d 100644 --- a/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/UtilCollections.java +++ b/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/util/UtilCollections.java @@ -78,7 +78,7 @@ public class UtilCollections { for (int i = 0; i < elements.length; i++) { - consumer.accept(Integer.valueOf(i), elements[i]); + consumer.accept(i, elements[i]); } } @@ -91,7 +91,7 @@ public class UtilCollections { for (int i = min; i < max; i++) { - consumer.accept(Integer.valueOf(i)); + consumer.accept(i); } } @@ -281,4 +281,4 @@ public class UtilCollections { return optionalList.stream().filter(Optional::isPresent).map(Optional::get).collect(Collectors.toList()); } -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java index 07a2058c5..3dabf341d 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java @@ -947,21 +947,22 @@ public class UtilEnt **/ public static int getNewEntityId(boolean modifynumber) { - try - { - Field field = net.minecraft.server.v1_8_R3.Entity.class.getDeclaredField("entityCount"); - field.setAccessible(true); - int entityId = field.getInt(null); - if (modifynumber) { - field.set(null, Integer.valueOf(entityId + 1)); - } - return entityId; - } - catch (Exception ex) - { - ex.printStackTrace(); - } - return -1; + try + { + Field field = net.minecraft.server.v1_8_R3.Entity.class.getDeclaredField("entityCount"); + field.setAccessible(true); + int entityId = field.getInt(null); + if (modifynumber) + { + field.set(null, entityId + 1); + } + return entityId; + } + catch (Exception ex) + { + ex.printStackTrace(); + } + return -1; } public static Entity getEntityById(int entityId) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityJoinRequestsPage.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityJoinRequestsPage.java index 1c5c69c92..e1f82de22 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityJoinRequestsPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityJoinRequestsPage.java @@ -137,7 +137,7 @@ public class CommunityJoinRequestsPage extends CommunitiesGUIPage @EventHandler public void onMembershipUpdate(CommunityMembershipUpdateEvent event) { - if (event.getCommunity().getId().intValue() != _community.getId().intValue()) + if (event.getCommunity().getId() != _community.getId()) { return; } @@ -155,7 +155,7 @@ public class CommunityJoinRequestsPage extends CommunitiesGUIPage @EventHandler public void onRequestsUpdate(CommunityJoinRequestsUpdateEvent event) { - if (event.getCommunity().getId().intValue() != _community.getId().intValue()) + if (event.getCommunity().getId() != _community.getId()) { return; } @@ -165,7 +165,7 @@ public class CommunityJoinRequestsPage extends CommunitiesGUIPage @EventHandler public void onCommunityDisband(CommunityDisbandEvent event) { - if (_community.getId().intValue() == event.getCommunity().getId().intValue()) + if (_community.getId() == event.getCommunity().getId()) { Viewer.closeInventory(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityMembersPage.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityMembersPage.java index 720d5a41c..2513f0e69 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityMembersPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunityMembersPage.java @@ -158,7 +158,7 @@ public class CommunityMembersPage extends CommunitiesGUIPage @EventHandler public void onRequestsUpdate(CommunityJoinRequestsUpdateEvent event) { - if (event.getCommunity().getId().intValue() != _community.getId().intValue()) + if (event.getCommunity().getId() != _community.getId()) { return; } @@ -171,7 +171,7 @@ public class CommunityMembersPage extends CommunitiesGUIPage @EventHandler public void onMembershipUpdate(CommunityMembershipUpdateEvent event) { - if (event.getCommunity().getId().intValue() != _community.getId().intValue()) + if (event.getCommunity().getId() != _community.getId()) { return; } @@ -182,7 +182,7 @@ public class CommunityMembersPage extends CommunitiesGUIPage @EventHandler public void onCommunityDisband(CommunityDisbandEvent event) { - if (_community.getId().intValue() == event.getCommunity().getId().intValue()) + if (_community.getId() == event.getCommunity().getId()) { Viewer.closeInventory(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunitySettingsPage.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunitySettingsPage.java index 56e1d0ba4..44031723a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunitySettingsPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/gui/community/CommunitySettingsPage.java @@ -109,7 +109,7 @@ public class CommunitySettingsPage extends CommunitiesGUIPage @EventHandler public void onRequestsUpdate(CommunityJoinRequestsUpdateEvent event) { - if (event.getCommunity().getId().intValue() != _community.getId().intValue()) + if (event.getCommunity().getId() != _community.getId()) { return; } @@ -122,7 +122,7 @@ public class CommunitySettingsPage extends CommunitiesGUIPage @EventHandler public void onMembershipUpdate(CommunityMembershipUpdateEvent event) { - if (event.getCommunity().getId().intValue() != _community.getId().intValue()) + if (event.getCommunity().getId() != _community.getId()) { return; } @@ -136,7 +136,7 @@ public class CommunitySettingsPage extends CommunitiesGUIPage @EventHandler public void onSettingsUpdate(CommunitySettingUpdateEvent event) { - if (event.getCommunity().getId().intValue() != _community.getId().intValue()) + if (event.getCommunity().getId() != _community.getId()) { return; } @@ -146,7 +146,7 @@ public class CommunitySettingsPage extends CommunitiesGUIPage @EventHandler public void onCommunityDisband(CommunityDisbandEvent event) { - if (_community.getId().intValue() == event.getCommunity().getId().intValue()) + if (_community.getId() == event.getCommunity().getId()) { Viewer.closeInventory(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java b/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java index 880190c79..a765a3904 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java @@ -5,17 +5,9 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Set; import java.util.UUID; -import net.minecraft.server.v1_8_R3.DataWatcher; -import net.minecraft.server.v1_8_R3.EntityArmorStand; -import net.minecraft.server.v1_8_R3.Packet; -import net.minecraft.server.v1_8_R3.PacketPlayOutEntity; -import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy; -import net.minecraft.server.v1_8_R3.PacketPlayOutEntityMetadata; -import net.minecraft.server.v1_8_R3.PacketPlayOutEntityTeleport; -import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityLiving; - import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -23,6 +15,14 @@ import org.bukkit.util.Vector; import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilPlayer; +import net.minecraft.server.v1_8_R3.DataWatcher; +import net.minecraft.server.v1_8_R3.EntityArmorStand; +import net.minecraft.server.v1_8_R3.Packet; +import net.minecraft.server.v1_8_R3.PacketPlayOutEntity; +import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy; +import net.minecraft.server.v1_8_R3.PacketPlayOutEntityMetadata; +import net.minecraft.server.v1_8_R3.PacketPlayOutEntityTeleport; +import net.minecraft.server.v1_8_R3.PacketPlayOutSpawnEntityLiving; /** * Floating text object with interaction and entity follow capabilities. @@ -34,7 +34,7 @@ public class Hologram { /** * 1.7 packets uses both EntityIDs while 1.8 uses only the first. */ - private ArrayList _entityIds = new ArrayList<>(); + private List _entityIds = new ArrayList<>(); private Entity _followEntity; private HologramManager _hologramManager; private String[] _hologramText = new String[0]; @@ -49,8 +49,8 @@ public class Hologram { private boolean _makeSpawnPackets = true; private Packet[] _packets1_8; private Packet[] _packets1_9; - private HashSet _playersInList = new HashSet<>(); - private ArrayList _playersTracking = new ArrayList<>(); + private Set _playersInList = new HashSet<>(); + private List _playersTracking = new ArrayList<>(); private boolean _removeEntityDeath; private HologramTarget _target = HologramTarget.BLACKLIST; private int _viewDistance = 70; @@ -223,7 +223,7 @@ public class Hologram { /** * @return The list of players that are in the holograms whitelist or blacklist. */ - protected ArrayList getPlayersTracking() + protected List getPlayersTracking() { return _playersTracking; } @@ -334,7 +334,7 @@ public class Hologram { for (int i = _entityIds.size(); i < _hologramText.length; i++) { - _entityIds.add(Integer.valueOf(UtilEnt.getNewEntityId())); + _entityIds.add(UtilEnt.getNewEntityId()); } } else diff --git a/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/LeaderboardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/LeaderboardManager.java index 8ce00fde8..08094511b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/LeaderboardManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/LeaderboardManager.java @@ -133,7 +133,7 @@ public class LeaderboardManager extends MiniPlugin final int index = i; Managers.get(StatsManager.class).loadStatId(board.getStatNames()[index], id -> { - board.setStatId(index, id.intValue()); + board.setStatId(index, id); }); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java index e88be1e36..ef89dd72a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java @@ -128,7 +128,7 @@ public class StatsManager extends MiniDbClientPlugin { final int statId = _stats.get(statName); - runSync(() -> idConsumer.accept(Integer.valueOf(statId))); + runSync(() -> idConsumer.accept(statId)); }); } 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 4f6b92576..564d25ec0 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 @@ -734,7 +734,7 @@ public class ClansManager extends MiniClientPlugin implements IRelat // 0 is set aside for active build so we just dupe build to this row // whenever we update it. - activeBuild.CustomBuildNumber = Integer.valueOf(0); + activeBuild.CustomBuildNumber = 0; _classManager.GetRepository().SaveCustomBuild(activeBuild); } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/mounts/MountManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/mounts/MountManager.java index 08056b6dc..8b9149719 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/mounts/MountManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/mounts/MountManager.java @@ -231,7 +231,7 @@ public class MountManager extends MiniDbClientPlugin { getRepository().deleteMount(token, id -> { - Get(player).removeMount(id.intValue()); + Get(player).removeMount(id); Pair summonPair = _summoning.get(player); if (summonPair != null) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java index 792f96cc2..4a1369e7d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/SiegeManager.java @@ -90,7 +90,7 @@ public class SiegeManager extends MiniPlugin System.out.println("[WEAPONS] LOADED SIEGE WEAPON " + weapon.getClass().getSimpleName() + " [" + token.UniqueId + "]"); - LiveSiegeWeapons.put(Integer.valueOf(token.UniqueId), weapon); + LiveSiegeWeapons.put(token.UniqueId, weapon); }) ) ); @@ -216,7 +216,7 @@ public class SiegeManager extends MiniPlugin { final SiegeWeaponToken token = weapon.toToken(); - if (UnsyncedSiegeWeapons.containsKey(Integer.valueOf(token.UniqueId))) + if (UnsyncedSiegeWeapons.containsKey(token.UniqueId)) continue; queue.push(() -> _repository.updateWeapon(token)); @@ -357,15 +357,15 @@ public class SiegeManager extends MiniPlugin { Cannon cannon = new Cannon(location, _clansManager.getClan(player), this, syncWithDb); - UnsyncedSiegeWeapons.put(Integer.valueOf(cannon.getUniqueId()), cannon); + UnsyncedSiegeWeapons.put(cannon.getUniqueId(), cannon); return cannon; } public void dead(SiegeWeapon weapon) { - LiveSiegeWeapons.remove(Integer.valueOf(weapon.getUniqueId())); - SiegeWeapon unsynced = UnsyncedSiegeWeapons.remove(Integer.valueOf(weapon.getUniqueId())); + LiveSiegeWeapons.remove(weapon.getUniqueId()); + SiegeWeapon unsynced = UnsyncedSiegeWeapons.remove(weapon.getUniqueId()); if (unsynced == null) _repository.deleteWeapon(weapon.getUniqueId()); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java index c20834e30..c8430eaa1 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java @@ -643,18 +643,22 @@ public class Outpost implements Listener EnclosedObject wait = new EnclosedObject<>(0); _blocks.values().stream().filter(block -> UtilMath.random.nextBoolean() && UtilMath.random.nextBoolean()).filter(block -> UtilMath.random.nextBoolean()).limit(13).forEach(block -> - _outpostManager.runSyncLater(() -> { + _outpostManager.runSyncLater(() -> + { UtilParticle.PlayParticleToAll(ParticleType.HUGE_EXPLOSION, block.getLocation(), new Vector(0,0,0), 1f, 1, ViewDist.MAX); _origin.getWorld().playSound(block.getLocation(), Sound.EXPLODE, 1.0f, 1.0f); - }, wait.Set(Integer.valueOf(wait.Get().intValue() + 4 + UtilMath.random.nextInt(4))).longValue()) + }, wait.Set(wait.Get() + 4 + UtilMath.random.nextInt(4))) ); - _outpostManager.runSyncLater(() -> { + _outpostManager.runSyncLater(() -> + { _blocks.values().stream().forEach(OutpostBlock::restore); - }, wait.Get().intValue() + 5L); + }, wait.Get() + 5L); - _outpostManager.runSyncLater(() -> { - _blocks.values().stream().forEach(block -> { + _outpostManager.runSyncLater(() -> + { + _blocks.values().stream().forEach(block -> + { Material mat = Material.getMaterial(block.getId()); if (UtilItem.isTranslucent(mat) || UtilMath.random.nextBoolean()) @@ -675,7 +679,7 @@ public class Outpost implements Listener }); cleanup(); - }, wait.Get().intValue() + 6L); + }, wait.Get() + 6L); if (_lifetimeLeft != null) _lifetimeLeft.stop(); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/OutpostManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/OutpostManager.java index c962a829d..a4f89b752 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/OutpostManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/OutpostManager.java @@ -201,7 +201,7 @@ public class OutpostManager extends MiniPlugin } _outposts.put(clan.getName(), new Outpost(this, clan, location, type)); - _idToOutpost.put(Integer.valueOf(_outposts.get(clan.getName()).getUniqueId()), _outposts.get(clan.getName())); + _idToOutpost.put(_outposts.get(clan.getName()).getUniqueId(), _outposts.get(clan.getName())); return true; } @@ -237,7 +237,7 @@ public class OutpostManager extends MiniPlugin if (event.getType() == UpdateType.FASTER) if (!_removalQueue.isEmpty()) - HandlerList.unregisterAll(_idToOutpost.remove(Integer.valueOf(_outposts.remove(_removalQueue.remove(0)).getUniqueId()))); + HandlerList.unregisterAll(_idToOutpost.remove(_outposts.remove(_removalQueue.remove(0)).getUniqueId())); if (event.getType() == UpdateType.TWOSEC) _outposts.values() @@ -268,7 +268,7 @@ public class OutpostManager extends MiniPlugin public Outpost Get(int outpostId) { - return _idToOutpost.get(Integer.valueOf(outpostId)); + return _idToOutpost.get(outpostId); } public ClansManager getClansManager() @@ -305,19 +305,23 @@ public class OutpostManager extends MiniPlugin { final Stack queue = new Stack<>(); - _outposts.values().forEach(outpost -> { + _outposts.values().forEach(outpost -> + { final OutpostToken token = outpost.toToken(); queue.push(() -> _repository.updateOutpost(token)); }); - runAsync(() -> { + runAsync(() -> + { while (!queue.isEmpty()) queue.pop().run(); - _repository.getOutpostsByServer(_clansManager.getServerId(), tokens -> { - tokens.forEach(token -> { - if (!_idToOutpost.containsKey(Integer.valueOf(token.UniqueId))) + _repository.getOutpostsByServer(_clansManager.getServerId(), tokens -> + { + tokens.forEach(token -> + { + if (!_idToOutpost.containsKey(token.UniqueId)) { System.out.println("[OUTPOSTS] OUTPOST [" + token.UniqueId + "] NO LONGER EXISTS, DELETING"); _repository.deleteOutpost(token.UniqueId); @@ -331,4 +335,4 @@ public class OutpostManager extends MiniPlugin { return _repository; } -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java index a864ffaf1..8175aa245 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java @@ -146,7 +146,7 @@ public class Cannon extends SiegeWeapon setFirepowerType(Material.SULPHUR); setAmmunitionType(Material.TNT); - setFirepowerSlots(Integer.valueOf(1), Integer.valueOf(3), Integer.valueOf(5), Integer.valueOf(7)); + setFirepowerSlots(1, 3, 5, 7); setMaximumFirepowerPerSlot(3); setAmmunitionSlot(4); @@ -154,7 +154,8 @@ public class Cannon extends SiegeWeapon _baseDamage = 650; - setFireRule(new AccessRule(AccessType.LCLICK_BB, player -> { + setFireRule(new AccessRule(AccessType.LCLICK_BB, player -> + { if (!isRiding(player)) { return false; @@ -189,7 +190,8 @@ public class Cannon extends SiegeWeapon enableInventory(UtilServer.getServer().createInventory(null, InventoryType.DISPENSER, C.cDAquaB + _name), new AccessRule(AccessType.RCLICK_BB, player -> player.equals(getRider()))); - setRideable(new AccessRule(AccessType.RCLICK_BB, player -> { + setRideable(new AccessRule(AccessType.RCLICK_BB, player -> + { if (!_ownerClan.isMember(player)) { UtilPlayer.message(player, F.main("Clans", "This Cannon is not owned by your Clan.")); @@ -300,7 +302,7 @@ public class Cannon extends SiegeWeapon _inventory.setItem(1, new ItemBuilder(Material.SULPHUR).setTitle(C.cWhiteB + "Firepower: " + C.cYellow + _firepower).setAmount(_firepower).build()); _inventory.setItem(2, new ItemBuilder(Material.LEVER).setTitle(C.cGreen + "+1 Firepower").build()); - for (int slot : UtilCollections.newList(Integer.valueOf(3), Integer.valueOf(5), Integer.valueOf(6), Integer.valueOf(7), Integer.valueOf(8))) + for (int slot : UtilCollections.newList(3, 5, 6, 7, 8)) { _inventory.setItem(slot, new ItemBuilder(Material.COBBLESTONE).setTitle(C.cGray + "Cannon Wall").build()); } @@ -457,4 +459,4 @@ public class Cannon extends SiegeWeapon false ); }*/ -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java index 4f6602afa..b3f491d2c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java @@ -685,7 +685,7 @@ public abstract class SiegeWeapon implements Listener } } } - else if (_firepowerSlots.contains(Integer.valueOf(slot))) + else if (_firepowerSlots.contains(slot)) { if (item.getType() != _firepowerType) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/RaidAltar.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/RaidAltar.java index 0bb876d79..62ec129a0 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/RaidAltar.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/RaidAltar.java @@ -70,7 +70,7 @@ public class RaidAltar } if (data != null) { - if (item.getData().getData() != data.byteValue()) + if (item.getData().getData() != data) { rejected = true; } @@ -84,7 +84,7 @@ public class RaidAltar if (amount != null) { - return count >= amount.intValue(); + return count >= amount; } else { @@ -143,7 +143,7 @@ public class RaidAltar } if (data != null) { - if (item.getData().getData() != data.byteValue()) + if (item.getData().getData() != data) { rejected = true; } @@ -154,7 +154,7 @@ public class RaidAltar if (item.getAmount() > (amount - removed)) { removed += (amount - removed); - item.setAmount(item.getAmount() - (amount - removed)); + item.setAmount(item.getAmount() - removed); } else { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/WorldData.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/WorldData.java index a647f268c..536bfcaba 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/WorldData.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/WorldData.java @@ -367,7 +367,7 @@ public class WorldData try { - return new Location(World, Integer.valueOf(coords[0])+0.5, Integer.valueOf(coords[1]), Integer.valueOf(coords[2])+0.5); + return new Location(World, Integer.valueOf(coords[0]) +0.5, Integer.valueOf(coords[1]), Integer.valueOf(coords[2]) + 0.5); } catch (Exception e) { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/tnt/TNTGenPage.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/tnt/TNTGenPage.java index efae5fd11..a619df775 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/tnt/TNTGenPage.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/shop/pvp/tnt/TNTGenPage.java @@ -92,9 +92,10 @@ public class TNTGenPage extends ShopPageBase " ", C.cWhite + "Purchased by " + F.elem(clan.getMembers().get(generator.getBuyer()).getPlayerName()), " ", - C.cWhite + "TNT Available: " + F.elem(Integer.valueOf(generator.getStock())), + C.cWhite + "TNT Available: " + F.elem(generator.getStock()), " ", - C.cWhite + "Next TNT: " + F.elem(nextTnt)).build(), (player, click) -> { + C.cWhite + "Next TNT: " + F.elem(nextTnt)).build(), (player, click) -> + { clearPage(); buildPage(); } @@ -106,7 +107,7 @@ public class TNTGenPage extends ShopPageBase .setTitle(C.cGreen + "TNT Generator") .setLore( " ", - C.cWhite + "TNT Available: " + F.elem(Integer.valueOf(generator.getStock())), + C.cWhite + "TNT Available: " + F.elem(generator.getStock()), " ", C.cWhite + "Next TNT: " + F.elem(nextTnt)).build(), (player, click) -> { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java index dde20c741..2f504a8ab 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java @@ -14,7 +14,7 @@ import mineplex.game.clans.tutorial.objective.ObjectiveGoal; public class HoldItemGoal extends ObjectiveGoal> { - private DefaultHashMap> _ticksHeld = new DefaultHashMap<>(key -> new EnclosedObject<>(Integer.valueOf(0))); + private DefaultHashMap> _ticksHeld = new DefaultHashMap<>(key -> new EnclosedObject<>(0)); private Material _material; private long _holdTicks; @@ -63,13 +63,13 @@ public class HoldItemGoal extends ObjectiveGoal> return; } - _ticksHeld.get(player.getName()).Set(Integer.valueOf(_ticksHeld.get(player.getName()).Get().intValue() + 1)); + _ticksHeld.get(player.getName()).Set(_ticksHeld.get(player.getName()).Get() + 1); - if (_ticksHeld.get(player.getName()).Get().intValue() >= 80) + if (_ticksHeld.get(player.getName()).Get() >= 80) { finish(player); } } }); } -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/IdentifyFieldsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/IdentifyFieldsGoal.java index a4c9186e4..e1d92f26d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/IdentifyFieldsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/IdentifyFieldsGoal.java @@ -9,14 +9,12 @@ import mineplex.core.common.DefaultHashMap; import mineplex.core.common.util.EnclosedObject; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import mineplex.game.clans.clans.map.events.PlayerGetMapEvent; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; -import mineplex.game.clans.tutorial.tutorials.clans.objective.AttackEnemyObjective; import mineplex.game.clans.tutorial.tutorials.clans.objective.FieldsObjective; public class IdentifyFieldsGoal extends ObjectiveGoal { - private DefaultHashMap> _ticksHeld = new DefaultHashMap<>(key -> new EnclosedObject<>(Integer.valueOf(0))); + private DefaultHashMap> _ticksHeld = new DefaultHashMap<>(key -> new EnclosedObject<>(0)); public IdentifyFieldsGoal(FieldsObjective objective) { @@ -42,7 +40,8 @@ public class IdentifyFieldsGoal extends ObjectiveGoal return; } - getActivePlayers().forEach(uuid -> { + getActivePlayers().forEach(uuid -> + { Player player = Bukkit.getPlayer(uuid); if (player != null && player.isOnline()) @@ -52,13 +51,13 @@ public class IdentifyFieldsGoal extends ObjectiveGoal return; } - _ticksHeld.get(player.getName()).Set(Integer.valueOf(_ticksHeld.get(player.getName()).Get().intValue() + 1)); + _ticksHeld.get(player.getName()).Set(_ticksHeld.get(player.getName()).Get() + 1); - if (_ticksHeld.get(player.getName()).Get().intValue() >= 80) + if (_ticksHeld.get(player.getName()).Get() >= 80) { finish(player); } } }); } -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/repository/TutorialRepository.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/repository/TutorialRepository.java index a81ababe2..e7d764742 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/repository/TutorialRepository.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/repository/TutorialRepository.java @@ -30,7 +30,8 @@ public class TutorialRepository extends RepositoryBase public void SetTimesPlayed(UUID uuid, int timesPlayed) { // Prevent duplicate entries for individuals - executeQuery(GET, result -> { + executeQuery(GET, result -> + { if (result.next()) executeUpdate(UPDATE, new ColumnInt("timesPlayed", timesPlayed), new ColumnVarChar("uuid", 36, uuid.toString())); else @@ -42,14 +43,15 @@ public class TutorialRepository extends RepositoryBase { EnclosedObject status = new EnclosedObject<>(); - executeQuery(GET, result -> { + executeQuery(GET, result -> + { if (result.next()) - status.Set(Integer.valueOf(result.getInt("timesPlayed"))); + status.Set(result.getInt("timesPlayed")); else - status.Set(Integer.valueOf(0)); + status.Set(0); }, new ColumnVarChar("uuid", 36, uuid.toString())); - return status.Get().intValue(); + return status.Get(); } public int GetTimesPlayed(String name) @@ -61,4 +63,4 @@ public class TutorialRepository extends RepositoryBase { executeUpdate(CREATE_TABLE); } -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/salesannouncements/SalesAnnouncementManager.java b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/salesannouncements/SalesAnnouncementManager.java index bdc080e69..d0b01ec54 100644 --- a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/salesannouncements/SalesAnnouncementManager.java +++ b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/salesannouncements/SalesAnnouncementManager.java @@ -106,7 +106,7 @@ public class SalesAnnouncementManager extends MiniPlugin { runSync(() -> { - _data.remove(Integer.valueOf(id)); + _data.remove(id); UtilServer.CallEvent(new SalesAnnouncementRemoteListUpdateEvent()); }); } @@ -115,7 +115,7 @@ public class SalesAnnouncementManager extends MiniPlugin { runSync(() -> { - if (_data.containsKey(Integer.valueOf(id))) + if (_data.containsKey(id)) { _repo.loadAnnouncement(id, data -> { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/salesannouncements/SalesAnnouncementManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/salesannouncements/SalesAnnouncementManager.java index 8b4065196..cb35a67ab 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/salesannouncements/SalesAnnouncementManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/salesannouncements/SalesAnnouncementManager.java @@ -107,7 +107,7 @@ public class SalesAnnouncementManager extends MiniPlugin { runSync(() -> { - _data.remove(Integer.valueOf(id)); + _data.remove(id); UtilServer.CallEvent(new SalesAnnouncementRemoteListUpdateEvent()); }); } @@ -116,7 +116,7 @@ public class SalesAnnouncementManager extends MiniPlugin { runSync(() -> { - if (_data.containsKey(Integer.valueOf(id))) + if (_data.containsKey(id)) { _repo.loadAnnouncement(id, data -> { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/salesannouncements/SalesAnnouncementRepository.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/salesannouncements/SalesAnnouncementRepository.java index f2fc92511..a7d0c5eda 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/salesannouncements/SalesAnnouncementRepository.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/salesannouncements/SalesAnnouncementRepository.java @@ -153,7 +153,7 @@ public class SalesAnnouncementRepository extends RepositoryBase { runAsync(() -> { - executeUpdate(UPDATE_ANNOUNCEMENT_STATUS, new ColumnBoolean("enabled", data.isEnabled()), new ColumnInt("id", data.getId().intValue())); + executeUpdate(UPDATE_ANNOUNCEMENT_STATUS, new ColumnBoolean("enabled", data.isEnabled()), new ColumnInt("id", data.getId())); if (after != null) { runSync(after); @@ -165,7 +165,7 @@ public class SalesAnnouncementRepository extends RepositoryBase { runAsync(() -> { - executeUpdate(DELETE_ANNOUNCEMENT, new ColumnInt("id", data.getId().intValue())); + executeUpdate(DELETE_ANNOUNCEMENT, new ColumnInt("id", data.getId())); if (after != null) { runSync(after); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java index 4a0f2ede7..0a93770f5 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Sharpshooter.java @@ -119,7 +119,8 @@ public class Sharpshooter extends Skill public void missReset(ProjectileHitEvent event) { final Projectile projectile = event.getEntity(); - Factory.runSyncLater(() -> { + Factory.runSyncLater(() -> + { if (!projectile.isDead() && _arrows.containsKey(projectile)) { Player shooter = (Player) projectile.getShooter(); @@ -131,14 +132,14 @@ public class Sharpshooter extends Skill if (!_missedCount.containsKey(shooter)) { - _missedCount.put(shooter, Integer.valueOf(1)); + _missedCount.put(shooter, 1); } else { - _missedCount.put(shooter, Integer.valueOf(_missedCount.get(shooter).intValue() + 1)); + _missedCount.put(shooter, _missedCount.get(shooter) + 1); // Reset - if (_missedCount.get(shooter).intValue() >= 2) + if (_missedCount.get(shooter) >= 2) { _hitCount.remove(shooter); _missedCount.remove(shooter); @@ -199,4 +200,4 @@ public class Sharpshooter extends Skill _hitCount.remove(player); _missedCount.remove(player); } -} +} \ No newline at end of file diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssaultTDM.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssaultTDM.java index e88701439..a5d9f8e6a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssaultTDM.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssaultTDM.java @@ -441,7 +441,7 @@ public class CastleAssaultTDM extends TeamGame GameTeam red = GetTeam(ChatColor.RED); GameTeam blue = GetTeam(ChatColor.AQUA); - if (_teamKills.get(blue).intValue() >= KILLS_TO_WIN) + if (_teamKills.get(blue) >= KILLS_TO_WIN) { AnnounceEnd(blue); writeFinalScoreboard(blue.GetColor() + blue.GetName(), _teamKills.get(blue)); @@ -495,7 +495,7 @@ public class CastleAssaultTDM extends TeamGame SetState(GameState.End); return; } - if (_teamKills.get(red).intValue() >= KILLS_TO_WIN) + if (_teamKills.get(red) >= KILLS_TO_WIN) { AnnounceEnd(red); writeFinalScoreboard(red.GetColor() + red.GetName(), _teamKills.get(red)); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/kits/PerkBloodlust.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/kits/PerkBloodlust.java index 2fc724eef..366b8544c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/kits/PerkBloodlust.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/kits/PerkBloodlust.java @@ -43,7 +43,7 @@ public class PerkBloodlust extends Perk Integer id = _lusting.remove(event.getEntity()); if (id != null) { - Bukkit.getScheduler().cancelTask(id.intValue()); + Bukkit.getScheduler().cancelTask(id); } } @@ -89,7 +89,7 @@ public class PerkBloodlust extends Perk Integer id = _lusting.remove(player); if (id != null) { - Bukkit.getScheduler().cancelTask(id.intValue()); + Bukkit.getScheduler().cancelTask(id); } player.sendMessage(C.cRed + "You are now channeling bloodlust for " + _duration + " seconds!"); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java index 106e04251..8ba1b2842 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java @@ -335,20 +335,23 @@ public class Gun extends StrikeItem { if(_kills == -1) { - new BukkitRunnable() { - public void run() { + new BukkitRunnable() + { + public void run() + { PlayerStats remoteStats = game.getHost().getArcadeManager().GetStatsManager().Get(player);; _kills = (int) remoteStats.getStat(game.getHost().GetName() + "." + getStatNameKills(true)); Player owner = UtilPlayer.searchExact(getOwnerName()); - if(owner != null) { + if (owner != null) + { HashMap localStatsMap = game.getHost().GetStats().get(owner); - if(localStatsMap != null) + if (localStatsMap != null) { Integer kills = localStatsMap.get(game.getHost().GetName() + "." + getStatNameKills(true)); - if(kills != null) + if (kills != null) { - _kills += kills.intValue(); + _kills += kills; } } } @@ -358,12 +361,12 @@ public class Gun extends StrikeItem } } int kls = _kills; - if(kls == -1) kls = 0; + if (kls == -1) kls = 0; String owner = C.Reset + (getOwnerName() == null ? "" : getOwnerName() + "'s "); String reload = C.Bold + getChatName() + (_reloadTick ? ChatColor.RED : ChatColor.WHITE); String kills = C.cYellow + " " + kls + " kills"; - if(!hasCustomSkin()) + if (!hasCustomSkin()) { kills = ""; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/stattrackers/PerfectionistTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/stattrackers/PerfectionistTracker.java index 02de00fc5..87aedb4f3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/stattrackers/PerfectionistTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/stattrackers/PerfectionistTracker.java @@ -14,7 +14,6 @@ import org.bukkit.event.EventHandler; public class PerfectionistTracker extends StatTracker { - private SpeedBuilders _game; private NautHashMap _perfectBuilds = new NautHashMap(); @@ -42,9 +41,8 @@ public class PerfectionistTracker extends StatTracker for (Entry entry : _perfectBuilds.entrySet()) { - if (entry.getValue().intValue() == _game.getRoundsPlayed()) + if (entry.getValue() == _game.getRoundsPlayed()) addStat(entry.getKey(), "PerfectWins", 1, true, false); } } - -} +} \ No newline at end of file diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/valentines/tutorial/TutorialValentines.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/valentines/tutorial/TutorialValentines.java index 6ec02a900..8752de715 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/valentines/tutorial/TutorialValentines.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/valentines/tutorial/TutorialValentines.java @@ -125,7 +125,7 @@ public class TutorialValentines extends GameTutorial for (Entry data : _pigs.entrySet()) { //Move - if (data.getValue().intValue() == 0) + if (data.getValue() == 0) { if (UtilMath.offset(data.getKey().getLocation(), _pigWaypointA) > 1) { @@ -136,7 +136,7 @@ public class TutorialValentines extends GameTutorial data.setValue(1); } } - if (data.getValue().intValue() == 1) + if (data.getValue() == 1) { if (UtilMath.offset(data.getKey().getLocation(), _pigWaypointB) > 1) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java index 455ef8c40..24d9f717f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java @@ -714,7 +714,7 @@ public class GameHostManager implements Listener { if (isCommunityServer()) { - if (getOwner().getId().intValue() == event.getCommunity().getId().intValue()) + if (getOwner().getId() == event.getCommunity().getId()) { setHostExpired(true, getOwner().getName() + " has disbanded and abandoned the server. Thanks for playing!"); }