diff options
Diffstat (limited to 'src/main/java/net/minecraft/server')
27 files changed, 36 insertions, 36 deletions
diff --git a/src/main/java/net/minecraft/server/BlockButton.java b/src/main/java/net/minecraft/server/BlockButton.java index 4c19f0bf..b89ab6f8 100644 --- a/src/main/java/net/minecraft/server/BlockButton.java +++ b/src/main/java/net/minecraft/server/BlockButton.java @@ -5,7 +5,7 @@ import java.util.Random; // CraftBukkit start import org.bukkit.BlockFace; import org.bukkit.craftbukkit.CraftBlock; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockInteractEvent; import org.bukkit.event.block.BlockRedstoneEvent; diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java index 5806a8a6..d8f7abf1 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -3,9 +3,9 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.entity.LivingEntity; import org.bukkit.craftbukkit.CraftBlock; -import org.bukkit.craftbukkit.CraftEntity; -import org.bukkit.craftbukkit.CraftLivingEntity; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java index 33765d52..52b2bdde 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -4,7 +4,7 @@ import java.util.Random; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockInteractEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockDoor.java b/src/main/java/net/minecraft/server/BlockDoor.java index d7f46c81..67385dbf 100644 --- a/src/main/java/net/minecraft/server/BlockDoor.java +++ b/src/main/java/net/minecraft/server/BlockDoor.java @@ -4,7 +4,7 @@ import java.util.Random; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockInteractEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockFurnace.java b/src/main/java/net/minecraft/server/BlockFurnace.java index 4435bdb3..1f235128 100644 --- a/src/main/java/net/minecraft/server/BlockFurnace.java +++ b/src/main/java/net/minecraft/server/BlockFurnace.java @@ -4,7 +4,7 @@ import java.util.Random; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockInteractEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockJukeBox.java b/src/main/java/net/minecraft/server/BlockJukeBox.java index 91c37d61..bb5bb205 100644 --- a/src/main/java/net/minecraft/server/BlockJukeBox.java +++ b/src/main/java/net/minecraft/server/BlockJukeBox.java @@ -2,7 +2,7 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockInteractEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockLever.java b/src/main/java/net/minecraft/server/BlockLever.java index 646c1dbc..3b92c7b4 100644 --- a/src/main/java/net/minecraft/server/BlockLever.java +++ b/src/main/java/net/minecraft/server/BlockLever.java @@ -3,7 +3,7 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.BlockFace; import org.bukkit.craftbukkit.CraftBlock; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockInteractEvent; import org.bukkit.event.block.BlockRedstoneEvent; diff --git a/src/main/java/net/minecraft/server/BlockPressurePlate.java b/src/main/java/net/minecraft/server/BlockPressurePlate.java index f96bd5f1..dad613bf 100644 --- a/src/main/java/net/minecraft/server/BlockPressurePlate.java +++ b/src/main/java/net/minecraft/server/BlockPressurePlate.java @@ -5,8 +5,8 @@ import java.util.Random; // CraftBukkit start import org.bukkit.BlockFace;import org.bukkit.craftbukkit.CraftBlock; -import org.bukkit.craftbukkit.CraftLivingEntity; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockInteractEvent; import org.bukkit.event.block.BlockRedstoneEvent; diff --git a/src/main/java/net/minecraft/server/BlockWorkbench.java b/src/main/java/net/minecraft/server/BlockWorkbench.java index 9a23565d..ceb60861 100644 --- a/src/main/java/net/minecraft/server/BlockWorkbench.java +++ b/src/main/java/net/minecraft/server/BlockWorkbench.java @@ -2,7 +2,7 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockInteractEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 75f53ac2..212da33a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1,9 +1,9 @@ package net.minecraft.server; // CraftBukkit start -import org.bukkit.craftbukkit.CraftEntity; -import org.bukkit.craftbukkit.CraftLivingEntity; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.entity.EntityDamageEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java index 004c8243..3c01822d 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java @@ -5,8 +5,8 @@ import java.util.Random; // CraftBukkit start import org.bukkit.Location; -import org.bukkit.craftbukkit.CraftBoat; -import org.bukkit.craftbukkit.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftBoat; +import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.CraftMappable; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.Event.Type; diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java index 12c4777f..bad76af2 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -3,7 +3,7 @@ package net.minecraft.server; import java.util.List; import java.util.Random; import org.bukkit.entity.MobType; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerEggThrowEvent; diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java index 53367fd5..4287d39a 100644 --- a/src/main/java/net/minecraft/server/EntityMinecart.java +++ b/src/main/java/net/minecraft/server/EntityMinecart.java @@ -6,9 +6,9 @@ import java.util.Random; // CraftBukkit start import org.bukkit.Location; import org.bukkit.Vector; -import org.bukkit.craftbukkit.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.CraftMappable; -import org.bukkit.craftbukkit.CraftMinecart; +import org.bukkit.craftbukkit.entity.CraftMinecart; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.Event.Type; import org.bukkit.event.vehicle.*; diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java index dc207a0a..1ff4c479 100644 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java @@ -3,7 +3,7 @@ package net.minecraft.server; import java.util.Random; // CraftBukkit start -import org.bukkit.craftbukkit.CraftLivingEntity; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.Event.Type; import org.bukkit.event.entity.EntityCombustEvent; diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java index 77192b05..96dd4270 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -3,7 +3,7 @@ package net.minecraft.server; import java.util.Random; // CraftBukkit start -import org.bukkit.craftbukkit.CraftLivingEntity; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.Event.Type; import org.bukkit.event.entity.EntityCombustEvent; diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java index 87abf71c..f98fd302 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -1,9 +1,9 @@ package net.minecraft.server; // CraftBukkit start -import org.bukkit.craftbukkit.CraftEntity; -import org.bukkit.craftbukkit.CraftLivingEntity; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftEntity; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java index 7fa63808..38e0ee73 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -4,7 +4,7 @@ package net.minecraft.server; import org.bukkit.BlockFace; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftItemStack; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockPlaceEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ItemBoat.java b/src/main/java/net/minecraft/server/ItemBoat.java index a7e1abf7..1a6d92d5 100644 --- a/src/main/java/net/minecraft/server/ItemBoat.java +++ b/src/main/java/net/minecraft/server/ItemBoat.java @@ -3,7 +3,7 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftItemStack; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerItemEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java index 8944b8e6..fc85b5a7 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -6,7 +6,7 @@ import java.util.Random; import org.bukkit.BlockFace; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftItemStack; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerItemEvent; diff --git a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java index 637e99c6..57a9eb9e 100644 --- a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java +++ b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java @@ -5,7 +5,7 @@ import java.util.Random; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftItemStack; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerItemEvent; import org.bukkit.event.block.BlockIgniteEvent; diff --git a/src/main/java/net/minecraft/server/ItemHoe.java b/src/main/java/net/minecraft/server/ItemHoe.java index f9562139..9e656b1e 100644 --- a/src/main/java/net/minecraft/server/ItemHoe.java +++ b/src/main/java/net/minecraft/server/ItemHoe.java @@ -5,7 +5,7 @@ import java.util.Random; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftItemStack; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerItemEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java index 23b592f2..f8ad9519 100644 --- a/src/main/java/net/minecraft/server/ItemMinecart.java +++ b/src/main/java/net/minecraft/server/ItemMinecart.java @@ -3,7 +3,7 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftItemStack; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerItemEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ItemRedstone.java b/src/main/java/net/minecraft/server/ItemRedstone.java index ee942843..4ea47052 100644 --- a/src/main/java/net/minecraft/server/ItemRedstone.java +++ b/src/main/java/net/minecraft/server/ItemRedstone.java @@ -3,7 +3,7 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftItemStack; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerItemEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ItemSeeds.java b/src/main/java/net/minecraft/server/ItemSeeds.java index ae33789d..cd086db0 100644 --- a/src/main/java/net/minecraft/server/ItemSeeds.java +++ b/src/main/java/net/minecraft/server/ItemSeeds.java @@ -3,7 +3,7 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftItemStack; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerItemEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ItemSign.java b/src/main/java/net/minecraft/server/ItemSign.java index da0e62d5..f8fedd37 100644 --- a/src/main/java/net/minecraft/server/ItemSign.java +++ b/src/main/java/net/minecraft/server/ItemSign.java @@ -3,7 +3,7 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftItemStack; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerItemEvent; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index a1f3a9bc..81b7a994 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -10,7 +10,7 @@ import org.bukkit.BlockDamageLevel; import org.bukkit.Location; import org.bukkit.craftbukkit.CraftBlock; import org.bukkit.craftbukkit.CraftItemStack; -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockDamageEvent; diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 36b1260e..670bcef5 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -5,7 +5,7 @@ import java.util.*; import java.util.logging.Logger; // CraftBukkit start -import org.bukkit.craftbukkit.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.Event.Type; import org.bukkit.event.player.PlayerEvent; |