summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/bukkit
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-03-26 22:32:56 +0100
committerErik Broes <erikbroes@grum.nl>2011-03-26 22:32:56 +0100
commite24b10dfd9d3b716b3c11ce46efd8caf54d52694 (patch)
treeab98237ae50bea2b7b1dec6f9445d9685c4cb4db /src/main/java/org/bukkit
parent47497aa3f93083ce7d51a1509d03dd8ceb074bcf (diff)
downloadcraftbukkit-e24b10dfd9d3b716b3c11ce46efd8caf54d52694.tar
craftbukkit-e24b10dfd9d3b716b3c11ce46efd8caf54d52694.tar.gz
craftbukkit-e24b10dfd9d3b716b3c11ce46efd8caf54d52694.tar.lz
craftbukkit-e24b10dfd9d3b716b3c11ce46efd8caf54d52694.tar.xz
craftbukkit-e24b10dfd9d3b716b3c11ce46efd8caf54d52694.zip
Updated for the cleanups done in Bukkit
Diffstat (limited to 'src/main/java/org/bukkit')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftChunk.java1
-rw-r--r--src/main/java/org/bukkit/craftbukkit/Main.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java4
-rw-r--r--src/main/java/org/bukkit/craftbukkit/util/ConcurrentSoftMap.java1
-rw-r--r--src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java1
5 files changed, 1 insertions, 8 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 65b56472..12c5ad84 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -2,7 +2,6 @@
package org.bukkit.craftbukkit;
import java.lang.ref.WeakReference;
-import java.util.HashMap;
import net.minecraft.server.ChunkPosition;
import net.minecraft.server.WorldServer;
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 7522fbfc..a60e0bcb 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -2,8 +2,6 @@ package org.bukkit.craftbukkit;
import java.io.File;
import java.io.IOException;
-import java.text.DateFormat;
-import java.text.Format;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.List;
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 410e4c8c..46c527c6 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -21,7 +21,6 @@ import net.minecraft.server.ItemStack;
import net.minecraft.server.World;
import net.minecraft.server.WorldServer;
-import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
@@ -31,7 +30,6 @@ import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.CreatureType;
-import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.Event.Type;
import org.bukkit.event.block.Action;
@@ -80,7 +78,7 @@ public class CraftEventFactory {
boolean canBuild = canBuild(craftWorld, player, placedBlock.getX(), placedBlock.getZ());
- BlockPlaceEvent event = new BlockPlaceEvent(Type.BLOCK_PLACE, placedBlock, replacedBlockState, blockClicked, itemInHand, player, canBuild);
+ BlockPlaceEvent event = new BlockPlaceEvent(placedBlock, replacedBlockState, blockClicked, itemInHand, player, canBuild);
craftServer.getPluginManager().callEvent(event);
return event;
diff --git a/src/main/java/org/bukkit/craftbukkit/util/ConcurrentSoftMap.java b/src/main/java/org/bukkit/craftbukkit/util/ConcurrentSoftMap.java
index 0099ae92..bbf5693b 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/ConcurrentSoftMap.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/ConcurrentSoftMap.java
@@ -1,7 +1,6 @@
package org.bukkit.craftbukkit.util;
import java.util.Map;
-import java.util.AbstractMap;
import java.util.LinkedList;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Set;
diff --git a/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java b/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java
index bcf78df3..79e7d439 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java
@@ -1,7 +1,6 @@
package org.bukkit.craftbukkit.util;
import java.util.ArrayList;
-import java.util.Arrays;
import net.minecraft.server.Chunk;
import net.minecraft.server.MinecraftServer;
import static org.bukkit.craftbukkit.util.Java15Compat.Arrays_copyOf;