diff options
Diffstat (limited to 'src/main/java/net/minecraft')
10 files changed, 16 insertions, 20 deletions
diff --git a/src/main/java/net/minecraft/server/BlockTripwire.java b/src/main/java/net/minecraft/server/BlockTripwire.java index 22d91242..00981725 100644 --- a/src/main/java/net/minecraft/server/BlockTripwire.java +++ b/src/main/java/net/minecraft/server/BlockTripwire.java @@ -3,10 +3,7 @@ package net.minecraft.server; import java.util.List; import java.util.Random; -// CraftBukkit start -import org.bukkit.event.block.BlockRedstoneEvent; -import org.bukkit.event.entity.EntityInteractEvent; -// CraftBukkit end +import org.bukkit.event.entity.EntityInteractEvent; // CraftBukkit public class BlockTripwire extends Block { diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java index 4891baf7..1b0c8e00 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -165,7 +165,7 @@ public class ChunkSection { this.b = cntb; this.c = cntc; } - + private void old_e() { // CraftBukkit end this.b = 0; diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java index a7006491..8fb76c7a 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -4,7 +4,6 @@ package net.minecraft.server; import org.bukkit.entity.Ageable; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; -import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.event.player.PlayerEggThrowEvent; // CraftBukkit end @@ -49,7 +48,7 @@ public class EntityEgg extends EntityProjectile { if (hatching) { for (int k = 0; k < numHatching; k++) { - org.bukkit.entity.Entity entity = world.getWorld().spawn(new org.bukkit.Location(world.getWorld(), this.locX, this.locY, this.locZ, this.yaw, 0.0F), hatchingType.getEntityClass(), SpawnReason.EGG); + org.bukkit.entity.Entity entity = world.getWorld().spawn(new org.bukkit.Location(world.getWorld(), this.locX, this.locY, this.locZ, this.yaw, 0.0F), hatchingType.getEntityClass(), org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EGG); if (entity instanceof Ageable) { ((Ageable) entity).setBaby(); } diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java index dd8d722b..ed18d558 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -2,7 +2,6 @@ package net.minecraft.server; // CraftBukkit start import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.player.PlayerTeleportEvent; // CraftBukkit end @@ -32,7 +31,7 @@ public class EntityEnderPearl extends EntityProjectile { if (!entityplayer.netServerHandler.disconnected && entityplayer.world == this.world) { // CraftBukkit start - CraftPlayer player = entityplayer.getBukkitEntity(); + org.bukkit.craftbukkit.entity.CraftPlayer player = entityplayer.getBukkitEntity(); org.bukkit.Location location = getBukkitEntity().getLocation(); location.setPitch(player.getLocation().getPitch()); location.setYaw(player.getLocation().getYaw()); diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java index ce169176..a66c26f2 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -1,5 +1,7 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit + public class EntityPig extends EntityAnimal { public EntityPig(World world) { @@ -82,7 +84,7 @@ public class EntityPig extends EntityAnimal { } } - org.bukkit.craftbukkit.event.CraftEventFactory.callEntityDeathEvent(this, loot); + CraftEventFactory.callEntityDeathEvent(this, loot); // CraftBukkit end } @@ -103,7 +105,7 @@ public class EntityPig extends EntityAnimal { EntityPigZombie entitypigzombie = new EntityPigZombie(this.world); // CraftBukkit start - if (org.bukkit.craftbukkit.event.CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) { + if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) { return; } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index f455f714..477de015 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -170,7 +170,7 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC world = new DemoWorldServer(this, new ServerNBTManager(server.getWorldContainer(), s1, true), s1, dimension, this.methodProfiler); } else { // CraftBukkit - world = new WorldServer(this, new ServerNBTManager(server.getWorldContainer(), s1, true), s1, dimension, worldsettings, this.methodProfiler, org.bukkit.World.Environment.getEnvironment(dimension), gen); + world = new WorldServer(this, new ServerNBTManager(server.getWorldContainer(), s1, true), s1, dimension, worldsettings, this.methodProfiler, Environment.getEnvironment(dimension), gen); } } else { String dim = "DIM" + dimension; @@ -204,7 +204,7 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC this.c(name); // CraftBukkit - world = new SecondaryWorldServer(this, new ServerNBTManager(server.getWorldContainer(), name, true), name, dimension, worldsettings, this.worlds.get(0), this.methodProfiler, org.bukkit.World.Environment.getEnvironment(dimension), gen); + world = new SecondaryWorldServer(this, new ServerNBTManager(server.getWorldContainer(), name, true), name, dimension, worldsettings, this.worlds.get(0), this.methodProfiler, Environment.getEnvironment(dimension), gen); } if (gen != null) { diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 41e77727..b27cc152 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -847,7 +847,7 @@ public class NetServerHandler extends NetHandler { ((EntityPlayer) recipient).sendMessage(s); } } else { - for (org.bukkit.entity.Player recipient : event.getRecipients()) { + for (Player recipient : event.getRecipients()) { recipient.sendMessage(s); } } diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java index bd253cff..380c0b96 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -23,10 +23,11 @@ public abstract class Packet { public boolean lowPriority = false; // CraftBukkit start - calculate packet ID once - used a bunch of times private int packetID; - + public Packet() { packetID = ((Integer) a.get(this.getClass())).intValue(); - } // CraftBukkit end + } + // CraftBukkit end static void a(int i, boolean flag, boolean flag1, Class oclass) { if (l.b(i)) { diff --git a/src/main/java/net/minecraft/server/TileEntityMobSpawner.java b/src/main/java/net/minecraft/server/TileEntityMobSpawner.java index faa7ead7..736477e2 100644 --- a/src/main/java/net/minecraft/server/TileEntityMobSpawner.java +++ b/src/main/java/net/minecraft/server/TileEntityMobSpawner.java @@ -2,8 +2,6 @@ package net.minecraft.server; import java.util.Iterator; -import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; // CraftBukkit - public class TileEntityMobSpawner extends TileEntity { public int spawnDelay = -1; @@ -71,7 +69,7 @@ public class TileEntityMobSpawner extends TileEntity { entity.setPositionRotation(d3, d4, d5, this.world.random.nextFloat() * 360.0F, 0.0F); if (entityliving == null || entityliving.canSpawn()) { this.a(entity); - this.world.addEntity(entity, SpawnReason.SPAWNER); // CraftBukkit + this.world.addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit this.world.triggerEffect(2004, this.x, this.y, this.z, 0); if (entityliving != null) { entityliving.aK(); diff --git a/src/main/java/net/minecraft/server/Vec3DPool.java b/src/main/java/net/minecraft/server/Vec3DPool.java index 897fef93..01bd659e 100644 --- a/src/main/java/net/minecraft/server/Vec3DPool.java +++ b/src/main/java/net/minecraft/server/Vec3DPool.java @@ -51,7 +51,7 @@ public class Vec3DPool { ++this.d; return vec3d; } - + // CraftBukkit start - offer back vector (can save LOTS of unneeded bloat) - works about 90% of the time public void release(Vec3D v) { if (this.alloclist == v) { |