summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/net/minecraft/server/Entity.java4
-rw-r--r--src/main/java/net/minecraft/server/EntityAnimals.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityChicken.java3
-rw-r--r--src/main/java/net/minecraft/server/EntityCow.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityCreature.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityCreeper.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityEgg.java4
-rw-r--r--src/main/java/net/minecraft/server/EntityFallingSand.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityFireball.java1
-rw-r--r--src/main/java/net/minecraft/server/EntityFish.java4
-rw-r--r--src/main/java/net/minecraft/server/EntityFlying.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityGhast.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityItem.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityLiving.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityMobs.java4
-rw-r--r--src/main/java/net/minecraft/server/EntityPainting.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityPig.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityPigZombie.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityPlayer.java3
-rw-r--r--src/main/java/net/minecraft/server/EntitySheep.java2
-rw-r--r--src/main/java/net/minecraft/server/EntitySkeleton.java1
-rw-r--r--src/main/java/net/minecraft/server/EntitySlime.java3
-rw-r--r--src/main/java/net/minecraft/server/EntitySnowball.java2
-rw-r--r--src/main/java/net/minecraft/server/EntitySpider.java2
-rw-r--r--src/main/java/net/minecraft/server/EntitySquid.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityTNTPrimed.java3
-rw-r--r--src/main/java/net/minecraft/server/EntityWaterMob.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityZombie.java1
-rw-r--r--src/main/java/net/minecraft/server/EntityZombieSimple.java2
29 files changed, 47 insertions, 20 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a05206b0..d56f1de9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1,13 +1,13 @@
package net.minecraft.server;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.Event.Type;
import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.EntityDamageByBlockEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-// CraftBukkit end
+//CraftBukkit end
import java.util.List;
import java.util.Random;
diff --git a/src/main/java/net/minecraft/server/EntityAnimals.java b/src/main/java/net/minecraft/server/EntityAnimals.java
index 31a5e86b..09df7f6f 100644
--- a/src/main/java/net/minecraft/server/EntityAnimals.java
+++ b/src/main/java/net/minecraft/server/EntityAnimals.java
@@ -1,7 +1,9 @@
package net.minecraft.server;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftAnimals;
+//CraftBukkit end
public abstract class EntityAnimals extends EntityCreature implements IAnimals {
diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
index 4ae15daf..64dfced3 100644
--- a/src/main/java/net/minecraft/server/EntityChicken.java
+++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -2,9 +2,10 @@ package net.minecraft.server;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.entity.CraftAnimals;
import org.bukkit.craftbukkit.entity.CraftChicken;
+//CraftBukkit end
public class EntityChicken extends EntityAnimals {
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index b98f37ea..d19d40d1 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -1,7 +1,9 @@
package net.minecraft.server;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftCow;
+//CraftBukkit end
public class EntityCow extends EntityAnimals {
diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
index 8beaf876..35f6da6f 100644
--- a/src/main/java/net/minecraft/server/EntityCreature.java
+++ b/src/main/java/net/minecraft/server/EntityCreature.java
@@ -2,8 +2,10 @@ package net.minecraft.server;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftCreature;
+//CraftBukkit end
public class EntityCreature extends EntityLiving {
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 589a92dc..c6b7f2e6 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -2,8 +2,10 @@ package net.minecraft.server;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftCreeper;
+//CraftBukkit end
public class EntityCreeper extends EntityMobs {
diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java
index 690701c7..1feff629 100644
--- a/src/main/java/net/minecraft/server/EntityEgg.java
+++ b/src/main/java/net/minecraft/server/EntityEgg.java
@@ -6,11 +6,7 @@ import java.util.Random;
// CraftBukkit start
import org.bukkit.entity.MobType;
import org.bukkit.entity.Player;
-import org.bukkit.craftbukkit.entity.CraftArrow;
import org.bukkit.craftbukkit.entity.CraftEgg;
-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.Event.Type;
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
diff --git a/src/main/java/net/minecraft/server/EntityFallingSand.java b/src/main/java/net/minecraft/server/EntityFallingSand.java
index bc0a106a..41ab3976 100644
--- a/src/main/java/net/minecraft/server/EntityFallingSand.java
+++ b/src/main/java/net/minecraft/server/EntityFallingSand.java
@@ -1,7 +1,9 @@
package net.minecraft.server;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftFallingSand;
+//CraftBukkit end
public class EntityFallingSand extends Entity {
diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
index 610e0e8d..27f28da9 100644
--- a/src/main/java/net/minecraft/server/EntityFireball.java
+++ b/src/main/java/net/minecraft/server/EntityFireball.java
@@ -3,6 +3,7 @@ package net.minecraft.server;
import java.util.List;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.entity.CraftFireball;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
index cc6893ae..09a73dbe 100644
--- a/src/main/java/net/minecraft/server/EntityFish.java
+++ b/src/main/java/net/minecraft/server/EntityFish.java
@@ -4,11 +4,7 @@ import java.util.List;
import java.util.Random;
// CraftBukkit start
-import org.bukkit.craftbukkit.entity.CraftEgg;
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.entity.CraftFireball;
import org.bukkit.craftbukkit.entity.CraftFish;
-import org.bukkit.craftbukkit.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
import org.bukkit.event.entity.EntityDamageEvent;
diff --git a/src/main/java/net/minecraft/server/EntityFlying.java b/src/main/java/net/minecraft/server/EntityFlying.java
index ea36e28e..8df4b9a1 100644
--- a/src/main/java/net/minecraft/server/EntityFlying.java
+++ b/src/main/java/net/minecraft/server/EntityFlying.java
@@ -1,7 +1,9 @@
package net.minecraft.server;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftFlying;
+//CraftBukkit end
public class EntityFlying extends EntityLiving {
diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
index df26fd88..e7dcd822 100644
--- a/src/main/java/net/minecraft/server/EntityGhast.java
+++ b/src/main/java/net/minecraft/server/EntityGhast.java
@@ -3,8 +3,10 @@ package net.minecraft.server;
import java.util.List;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftGhast;
+//CraftBukkit end
public class EntityGhast extends EntityFlying implements IMobs {
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 02210127..b6e5a4ea 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -2,8 +2,10 @@ package net.minecraft.server;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftItem;
+//CraftBukkit end
public class EntityItem extends Entity {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 30bd0ccd..678debc0 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3,8 +3,10 @@ package net.minecraft.server;
import java.util.List;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
+//CraftBukkit end
public abstract class EntityLiving extends Entity {
diff --git a/src/main/java/net/minecraft/server/EntityMobs.java b/src/main/java/net/minecraft/server/EntityMobs.java
index e55b4882..9085af9a 100644
--- a/src/main/java/net/minecraft/server/EntityMobs.java
+++ b/src/main/java/net/minecraft/server/EntityMobs.java
@@ -3,13 +3,9 @@ package net.minecraft.server;
import java.util.Random;
//CraftBukkit start
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.entity.CraftLivingEntity;
-import org.bukkit.craftbukkit.entity.CraftMinecart;
import org.bukkit.craftbukkit.entity.CraftMonster;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
diff --git a/src/main/java/net/minecraft/server/EntityPainting.java b/src/main/java/net/minecraft/server/EntityPainting.java
index fbe12e01..4373395f 100644
--- a/src/main/java/net/minecraft/server/EntityPainting.java
+++ b/src/main/java/net/minecraft/server/EntityPainting.java
@@ -2,8 +2,10 @@ package net.minecraft.server;
import java.util.*;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftPainting;
+//CraftBukkit end
public class EntityPainting extends Entity {
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index b51e3e95..2b67d72c 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -1,7 +1,9 @@
package net.minecraft.server;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftPig;
+//CraftBukkit end
public class EntityPig extends EntityAnimals {
diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
index a26a2a5d..f0451a07 100644
--- a/src/main/java/net/minecraft/server/EntityPigZombie.java
+++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
@@ -3,8 +3,10 @@ package net.minecraft.server;
import java.util.List;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftPigZombie;
+//CraftBukkit end
public class EntityPigZombie extends EntityZombie {
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 99a18914..aa8a9ed3 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -3,12 +3,13 @@ package net.minecraft.server;
import java.util.List;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
-// CraftBukkit end
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+//CraftBukkit end
public abstract class EntityPlayer extends EntityLiving {
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
index 4cdd79cf..5e51fa98 100644
--- a/src/main/java/net/minecraft/server/EntitySheep.java
+++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -2,8 +2,10 @@ package net.minecraft.server;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftSheep;
+//CraftBukkit end
public class EntitySheep extends EntityAnimals {
diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
index b4c789bb..b18ef99f 100644
--- a/src/main/java/net/minecraft/server/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
@@ -2,6 +2,7 @@ package net.minecraft.server;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.entity.CraftSkeleton;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.Event.Type;
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
index 6a08eaa1..c18e70a8 100644
--- a/src/main/java/net/minecraft/server/EntitySlime.java
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
@@ -2,9 +2,10 @@ package net.minecraft.server;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.entity.CraftSkeleton;
import org.bukkit.craftbukkit.entity.CraftSlime;
+//CraftBukkit stop
public class EntitySlime extends EntityLiving implements IMobs {
diff --git a/src/main/java/net/minecraft/server/EntitySnowball.java b/src/main/java/net/minecraft/server/EntitySnowball.java
index 7107d6e7..ff07e807 100644
--- a/src/main/java/net/minecraft/server/EntitySnowball.java
+++ b/src/main/java/net/minecraft/server/EntitySnowball.java
@@ -4,8 +4,6 @@ import java.util.List;
import java.util.Random;
//CraftBukkit start
-import org.bukkit.craftbukkit.entity.CraftEntity;
-import org.bukkit.craftbukkit.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftSnowball;
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
index f9a639dc..ee01de31 100644
--- a/src/main/java/net/minecraft/server/EntitySpider.java
+++ b/src/main/java/net/minecraft/server/EntitySpider.java
@@ -2,8 +2,10 @@ package net.minecraft.server;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftSpider;
+//CraftBukkit stop
public class EntitySpider extends EntityMobs {
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index 5e48e446..e6b02ffa 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -2,8 +2,10 @@ package net.minecraft.server;
import java.util.Random;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftSquid;
+//CraftBukkit stop
public class EntitySquid extends EntityWaterMob {
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
index 1705ba6e..4f228f58 100644
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -1,8 +1,9 @@
package net.minecraft.server;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.entity.CraftSkeleton;
import org.bukkit.craftbukkit.entity.CraftTNTPrimed;
+//CraftBukkit stop
public class EntityTNTPrimed extends Entity {
diff --git a/src/main/java/net/minecraft/server/EntityWaterMob.java b/src/main/java/net/minecraft/server/EntityWaterMob.java
index c37eac5b..e83d9c5c 100644
--- a/src/main/java/net/minecraft/server/EntityWaterMob.java
+++ b/src/main/java/net/minecraft/server/EntityWaterMob.java
@@ -1,7 +1,9 @@
package net.minecraft.server;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftWaterMob;
+//CraftBukkit stop
public class EntityWaterMob extends EntityCreature implements IAnimals {
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 93047815..e717f892 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -1,5 +1,6 @@
package net.minecraft.server;
+//CraftBukkit start
import org.bukkit.craftbukkit.entity.CraftZombie;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.Event.Type;
diff --git a/src/main/java/net/minecraft/server/EntityZombieSimple.java b/src/main/java/net/minecraft/server/EntityZombieSimple.java
index 4e9118ee..0b76a3bf 100644
--- a/src/main/java/net/minecraft/server/EntityZombieSimple.java
+++ b/src/main/java/net/minecraft/server/EntityZombieSimple.java
@@ -1,7 +1,9 @@
package net.minecraft.server;
+//CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftGiant;
+//CraftBukkit stop
public class EntityZombieSimple extends EntityMobs {