diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index 61895ea1..53cbe020 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -43,7 +43,6 @@ import network.packets.swg.zone.baselines.Baseline.BaselineType; import network.packets.swg.zone.object_controller.PostureUpdate; import resources.HologramColour; import resources.Posture; -import resources.PvpFaction; import resources.PvpFlag; import resources.PvpStatus; import resources.Race; diff --git a/src/resources/objects/group/GroupObject.java b/src/resources/objects/group/GroupObject.java index 2614c4fc..3faf71e1 100644 --- a/src/resources/objects/group/GroupObject.java +++ b/src/resources/objects/group/GroupObject.java @@ -37,8 +37,6 @@ import resources.objects.creature.CreatureObject; import resources.player.Player; import utilities.Encoder; -import java.io.IOException; -import java.io.ObjectInputStream; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Collections; diff --git a/src/resources/objects/group/LootRule.java b/src/resources/objects/group/LootRule.java index 6cea28bb..33a10d36 100644 --- a/src/resources/objects/group/LootRule.java +++ b/src/resources/objects/group/LootRule.java @@ -27,9 +27,6 @@ ***********************************************************************************/ package resources.objects.group; -import java.util.HashMap; -import java.util.Map; - /** * * @author skylerlehan diff --git a/src/resources/radial/Radials.java b/src/resources/radial/Radials.java index 821173a6..7f92adff 100644 --- a/src/resources/radial/Radials.java +++ b/src/resources/radial/Radials.java @@ -30,9 +30,6 @@ package resources.radial; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - import resources.objects.SWGObject; import resources.player.Player; import resources.server_info.Log; diff --git a/src/services/combat/CombatManager.java b/src/services/combat/CombatManager.java index 0b691f4d..e0f00212 100644 --- a/src/services/combat/CombatManager.java +++ b/src/services/combat/CombatManager.java @@ -48,8 +48,6 @@ import java.util.Iterator; import java.util.Random; import java.util.concurrent.Future; import resources.Posture; -import resources.PvpFaction; -import resources.PvpFlag; import resources.combat.AttackType; import resources.combat.CombatStatus; import resources.combat.HitLocation; @@ -66,7 +64,6 @@ import resources.objects.creature.CreatureObject; import resources.objects.tangible.TangibleObject; import resources.objects.weapon.WeaponObject; import resources.server_info.Log; -import utilities.Scripts; import utilities.ThreadUtilities; public class CombatManager extends Manager { @@ -482,6 +479,8 @@ public class CombatManager extends Manager { case DEAD: case INCAPACITATED: return CombatStatus.INVALID_TARGET; + default: + break; } } diff --git a/src/services/combat/CorpseService.java b/src/services/combat/CorpseService.java index e97e5fd0..658ee23c 100644 --- a/src/services/combat/CorpseService.java +++ b/src/services/combat/CorpseService.java @@ -234,6 +234,8 @@ public final class CorpseService extends Service { } break; } + default: + break; } } diff --git a/src/services/commands/BuffService.java b/src/services/commands/BuffService.java index 08bb04dd..7fe11020 100644 --- a/src/services/commands/BuffService.java +++ b/src/services/commands/BuffService.java @@ -43,8 +43,6 @@ import java.util.Map.Entry; import java.util.Optional; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; -import java.util.logging.Level; -import java.util.logging.Logger; import network.packets.swg.zone.PlayClientEffectObjectMessage; import resources.client_info.ClientFactory; import resources.client_info.visitors.DatatableData; @@ -183,6 +181,8 @@ public class BuffService extends Service { switch(pei.getEvent()) { case PE_FIRST_ZONE: handleFirstZone(creature); break; case PE_DISAPPEAR: handleDisappear(creature); break; + default: + break; } } diff --git a/src/services/commands/CommandService.java b/src/services/commands/CommandService.java index ca318858..7d2cd94e 100644 --- a/src/services/commands/CommandService.java +++ b/src/services/commands/CommandService.java @@ -72,8 +72,6 @@ import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.Logger; import network.packets.swg.zone.object_controller.CommandTimer; import resources.combat.HitType; import resources.commands.DefaultPriority; @@ -150,6 +148,8 @@ public class CommandService extends Service { combatQueueMap.remove(i.getPlayer()); } break; + default: + break; } } diff --git a/src/services/commands/EntertainmentService.java b/src/services/commands/EntertainmentService.java index dac93223..0216ef7c 100644 --- a/src/services/commands/EntertainmentService.java +++ b/src/services/commands/EntertainmentService.java @@ -202,7 +202,8 @@ public class EntertainmentService extends Service { performerMap.get(creature.getObjectId()).clearSpectators(); performerMap.remove(creature.getObjectId()); } - + break; + default: break; } } diff --git a/src/services/group/GroupService.java b/src/services/group/GroupService.java index 0ba7df2b..4d037529 100644 --- a/src/services/group/GroupService.java +++ b/src/services/group/GroupService.java @@ -45,11 +45,8 @@ import services.player.PlayerManager; import utilities.IntentFactory; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; @@ -65,7 +62,7 @@ public class GroupService extends Service { private final ScheduledExecutorService logoutService; private final Map groups; - private Map logoffTimers; + private Map> logoffTimers; public GroupService() { logoutService = Executors.newSingleThreadScheduledExecutor(ThreadUtilities.newThreadFactory("group-logout-timer")); @@ -181,7 +178,7 @@ public class GroupService extends Service { // Create a timer with the GroupMember player owns as the key // and a timer set to fire and remove that member as the value CreatureObject playerCreo = player.getCreatureObject(); - Future future = logoutService.schedule(new LogOffTask(this, playerCreo), 4, TimeUnit.MINUTES); + Future future = logoutService.schedule(new LogOffTask(this, playerCreo), 4, TimeUnit.MINUTES); synchronized (this.logoffTimers) { this.logoffTimers.put(playerCreo, future); @@ -309,8 +306,6 @@ public class GroupService extends Service { } private void handleGroupUninvite(Player player, CreatureObject target) { - CreatureObject playerCreo = player.getCreatureObject(); - if (target == null) { sendSystemMessage(player, "uninvite_no_target_self"); return; @@ -319,9 +314,6 @@ public class GroupService extends Service { Player targetOwner = target.getOwner(); String targetName = targetOwner.getCharacterName(); - if (targetOwner == null) - return; - if (target.getInviterData() == null) { sendSystemMessage(player, "uninvite_not_invited", "TT", targetName); return; diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java index a35b11f9..95b1262b 100644 --- a/src/services/objects/ObjectManager.java +++ b/src/services/objects/ObjectManager.java @@ -57,7 +57,6 @@ import services.map.MapManager; import services.player.PlayerManager; import services.spawn.SpawnerService; import services.spawn.StaticService; -import utilities.Scripts; public class ObjectManager extends Manager { diff --git a/src/services/objects/StaticItemService.java b/src/services/objects/StaticItemService.java index 5ebb4c80..8c1b879f 100644 --- a/src/services/objects/StaticItemService.java +++ b/src/services/objects/StaticItemService.java @@ -200,6 +200,8 @@ public final class StaticItemService extends Service { case CONTAINER_FULL: new ChatBroadcastIntent(requesterOwner, "@system_msg:give_item_failure").broadcast(); break; + default: + break; } new ObjectCreatedIntent(object).broadcast(); diff --git a/src/services/sui/SuiService.java b/src/services/sui/SuiService.java index 4a90ca42..06e8f41a 100644 --- a/src/services/sui/SuiService.java +++ b/src/services/sui/SuiService.java @@ -50,8 +50,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Level; -import java.util.logging.Logger; public class SuiService extends Service {