diff --git a/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java b/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java index 107cb1b..f77be3d 100644 --- a/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java @@ -23,22 +23,18 @@ import java.util.Collection; import java.util.List; import org.bukkit.ChatColor; -import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.OfflinePlayer; import org.bukkit.World.Environment; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.BlockState; -import org.bukkit.block.Chest; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBurnEvent; -import org.bukkit.event.block.BlockDamageEvent; import org.bukkit.event.block.BlockDispenseEvent; import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockIgniteEvent; @@ -49,11 +45,8 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockSpreadEvent; import org.bukkit.event.block.SignChangeEvent; import org.bukkit.event.world.StructureGrowEvent; -import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; import org.bukkit.material.Dispenser; -import org.bukkit.util.Vector; //event handlers related to blocks public class BlockEventHandler implements Listener diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index bc38bbf..3b0bf80 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -26,8 +26,6 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.World.Environment; import org.bukkit.block.Block; -import org.bukkit.block.Hopper; -import org.bukkit.entity.Arrow; import org.bukkit.entity.Creature; import org.bukkit.entity.Creeper; import org.bukkit.entity.Enderman; @@ -38,7 +36,6 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Monster; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; -import org.bukkit.entity.ThrownPotion; import org.bukkit.entity.Villager; import org.bukkit.event.EventHandler; @@ -59,10 +56,7 @@ import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.hanging.HangingBreakEvent; import org.bukkit.event.hanging.HangingBreakEvent.RemoveCause; import org.bukkit.event.hanging.HangingPlaceEvent; -import org.bukkit.event.inventory.InventoryMoveItemEvent; import org.bukkit.event.vehicle.VehicleDamageEvent; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; //handles events related to entities diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java index 592880f..2266504 100644 --- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -21,14 +21,11 @@ package me.ryanhamshire.GriefPrevention; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Calendar; import java.util.Collection; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.logging.Logger; import net.milkbowl.vault.economy.Economy; @@ -42,7 +39,6 @@ import org.bukkit.OfflinePlayer; import org.bukkit.World; import org.bukkit.World.Environment; import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; import org.bukkit.command.*; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index c7933c3..c21eea4 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -18,7 +18,6 @@ package me.ryanhamshire.GriefPrevention; import java.util.ArrayList; -import java.util.Arrays; import java.util.Calendar; import java.util.Collection; import java.util.Date; @@ -407,7 +406,7 @@ class PlayerEventHandler implements Listener String logMessage = logMessageBuilder.toString(); - Collection players = (Collection)GriefPrevention.instance.getServer().getOnlinePlayers(); + Player [] players = (Player [])GriefPrevention.instance.getServer().getOnlinePlayers().toArray(); for(Player player : players) { if(player.hasPermission("griefprevention.eavesdrop") && !player.getName().equalsIgnoreCase(args[1])) @@ -1666,7 +1665,6 @@ class PlayerEventHandler implements Listener } //if he's resizing a claim and that claim hasn't been deleted since he started resizing it - if(playerData == null) playerData = this.dataStore.getPlayerData(player.getUniqueId()); if(playerData.claimResizing != null && playerData.claimResizing.inDataStore) { if(clickedBlock.getLocation().equals(playerData.lastShovelLocation)) return; @@ -1804,7 +1802,6 @@ class PlayerEventHandler implements Listener } //otherwise, since not currently resizing a claim, must be starting a resize, creating a new claim, or creating a subdivision - if(playerData == null) playerData = this.dataStore.getPlayerData(player.getUniqueId()); Claim claim = this.dataStore.getClaimAt(clickedBlock.getLocation(), true /*ignore height*/, playerData.lastClaim); //if within an existing claim, he's not creating a new one diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerRescueTask.java b/src/me/ryanhamshire/GriefPrevention/PlayerRescueTask.java index cb41581..0cdfe14 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerRescueTask.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerRescueTask.java @@ -18,8 +18,6 @@ package me.ryanhamshire.GriefPrevention; -import java.util.Calendar; - import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/me/ryanhamshire/GriefPrevention/UUIDFetcher.java b/src/me/ryanhamshire/GriefPrevention/UUIDFetcher.java index ff2855a..69c881f 100644 --- a/src/me/ryanhamshire/GriefPrevention/UUIDFetcher.java +++ b/src/me/ryanhamshire/GriefPrevention/UUIDFetcher.java @@ -3,8 +3,6 @@ package me.ryanhamshire.GriefPrevention; import com.google.common.base.Charsets; -import com.google.common.collect.ImmutableList; - import org.bukkit.OfflinePlayer; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -16,7 +14,6 @@ import java.net.HttpURLConnection; import java.net.URL; import java.nio.ByteBuffer; import java.util.*; -import java.util.concurrent.Callable; class UUIDFetcher { private static final double PROFILES_PER_REQUEST = 100;