SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität

All entity stuff in org.bukkit moved to org.bukkit.entity

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Dinnerbone 2011-01-15 21:21:05 +00:00
Ursprung 34674e7793
Commit d501bbf1a2
17 geänderte Dateien mit 93 neuen und 92 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
src/main/java/net/minecraft/server/BlockCactus.java
Datei anzeigen

@ -1,7 +1,7 @@
package net.minecraft.server;
// CraftBukkit start
import org.bukkit.LivingEntity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.CraftEntity;
import org.bukkit.craftbukkit.CraftLivingEntity;

2
src/main/java/net/minecraft/server/EntityEgg.java
Datei anzeigen

@ -2,7 +2,7 @@ package net.minecraft.server;
import java.util.List;
import java.util.Random;
import org.bukkit.MobType;
import org.bukkit.entity.MobType;
import org.bukkit.craftbukkit.CraftPlayer;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.Event.Type;

30
src/main/java/org/bukkit/craftbukkit/CraftArrow.java
Datei anzeigen

@ -1,15 +1,15 @@
package org.bukkit.craftbukkit;
import org.bukkit.Arrow;
import net.minecraft.server.EntityArrow;
/**
* Represents an arrow.
*
* @author sk89q
*/
public class CraftArrow extends CraftEntity implements Arrow {
CraftArrow(CraftServer server, EntityArrow entity) {
super(server, entity);
}
}
package org.bukkit.craftbukkit;
import org.bukkit.entity.Arrow;
import net.minecraft.server.EntityArrow;
/**
* Represents an arrow.
*
* @author sk89q
*/
public class CraftArrow extends CraftEntity implements Arrow {
CraftArrow(CraftServer server, EntityArrow entity) {
super(server, entity);
}
}

2
src/main/java/org/bukkit/craftbukkit/CraftBoat.java
Datei anzeigen

@ -1,7 +1,7 @@
package org.bukkit.craftbukkit;
import net.minecraft.server.EntityBoat;
import org.bukkit.Boat;
import org.bukkit.entity.Boat;
/**
* A minecart.

30
src/main/java/org/bukkit/craftbukkit/CraftEgg.java
Datei anzeigen

@ -1,15 +1,15 @@
package org.bukkit.craftbukkit;
import net.minecraft.server.EntityEgg;
import org.bukkit.Egg;
/**
* An egg.
*
* @author sk89q
*/
public class CraftEgg extends CraftEntity implements Egg {
public CraftEgg(CraftServer server, EntityEgg ent) {
super(server, ent);
}
}
package org.bukkit.craftbukkit;
import net.minecraft.server.EntityEgg;
import org.bukkit.entity.Egg;
/**
* An egg.
*
* @author sk89q
*/
public class CraftEgg extends CraftEntity implements Egg {
public CraftEgg(CraftServer server, EntityEgg ent) {
super(server, ent);
}
}

4
src/main/java/org/bukkit/craftbukkit/CraftEntity.java
Datei anzeigen

@ -6,7 +6,7 @@ import org.bukkit.Location;
import org.bukkit.Vector;
import org.bukkit.World;
public abstract class CraftEntity implements org.bukkit.Entity {
public abstract class CraftEntity implements org.bukkit.entity.Entity {
protected final CraftServer server;
private Entity entity;
@ -37,7 +37,7 @@ public abstract class CraftEntity implements org.bukkit.Entity {
entity.b(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
}
public void teleportTo(org.bukkit.Entity destination) {
public void teleportTo(org.bukkit.entity.Entity destination) {
teleportTo(destination.getLocation());
}

2
src/main/java/org/bukkit/craftbukkit/CraftHumanEntity.java
Datei anzeigen

@ -2,7 +2,7 @@
package org.bukkit.craftbukkit;
import net.minecraft.server.EntityPlayer;
import org.bukkit.HumanEntity;
import org.bukkit.entity.HumanEntity;
import org.bukkit.ItemStack;
import org.bukkit.PlayerInventory;

46
src/main/java/org/bukkit/craftbukkit/CraftItemDrop.java
Datei anzeigen

@ -1,23 +1,23 @@
package org.bukkit.craftbukkit;
import net.minecraft.server.EntityItem;
import org.bukkit.ItemDrop;
import org.bukkit.ItemStack;
/**
* Represents an item drop.
*
* @author sk89q
*/
public class CraftItemDrop extends CraftEntity implements ItemDrop {
private EntityItem item;
public CraftItemDrop(CraftServer server, EntityItem ent) {
super(server, ent);
this.item = ent;
}
public ItemStack getItemStack() {
return new CraftItemStack(item.a);
}
}
package org.bukkit.craftbukkit;
import net.minecraft.server.EntityItem;
import org.bukkit.entity.ItemDrop;
import org.bukkit.ItemStack;
/**
* Represents an item drop.
*
* @author sk89q
*/
public class CraftItemDrop extends CraftEntity implements ItemDrop {
private EntityItem item;
public CraftItemDrop(CraftServer server, EntityItem ent) {
super(server, ent);
this.item = ent;
}
public ItemStack getItemStack() {
return new CraftItemStack(item.a);
}
}

12
src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java
Datei anzeigen

@ -7,11 +7,11 @@ import net.minecraft.server.EntityEgg;
import net.minecraft.server.EntityLiving;
import net.minecraft.server.EntitySnowball;
import org.bukkit.Arrow;
import org.bukkit.Egg;
import org.bukkit.LivingEntity;
import org.bukkit.Snowball;
import org.bukkit.Vehicle;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Egg;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Snowball;
import org.bukkit.entity.Vehicle;
public class CraftLivingEntity extends CraftEntity implements LivingEntity {
private EntityLiving entity;
@ -87,7 +87,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return null;
}
org.bukkit.Entity vehicle = ((CraftWorld)getWorld()).toCraftEntity(entity.k);
org.bukkit.entity.Entity vehicle = ((CraftWorld)getWorld()).toCraftEntity(entity.k);
if (vehicle instanceof Vehicle) {
return (Vehicle)vehicle;
}

2
src/main/java/org/bukkit/craftbukkit/CraftMinecart.java
Datei anzeigen

@ -1,7 +1,7 @@
package org.bukkit.craftbukkit;
import net.minecraft.server.EntityMinecart;
import org.bukkit.Minecart;
import org.bukkit.entity.Minecart;
/**
* A minecart.

2
src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
Datei anzeigen

@ -6,7 +6,7 @@ import net.minecraft.server.EntityPlayer;
import net.minecraft.server.EntityPlayerMP;
import net.minecraft.server.Packet3Chat;
import org.bukkit.Location;
import org.bukkit.Player;
import org.bukkit.entity.Player;
public class CraftPlayer extends CraftHumanEntity implements Player {
private EntityPlayerMP entity;

2
src/main/java/org/bukkit/craftbukkit/CraftPoweredMinecart.java
Datei anzeigen

@ -1,7 +1,7 @@
package org.bukkit.craftbukkit;
import net.minecraft.server.EntityMinecart;
import org.bukkit.PoweredMinecart;
import org.bukkit.entity.PoweredMinecart;
/**
* A powered minecart.

1
src/main/java/org/bukkit/craftbukkit/CraftServer.java
Datei anzeigen

@ -1,5 +1,6 @@
package org.bukkit.craftbukkit;
import org.bukkit.entity.Player;
import java.io.File;
import java.util.ArrayList;
import java.util.List;

30
src/main/java/org/bukkit/craftbukkit/CraftSnowball.java
Datei anzeigen

@ -1,15 +1,15 @@
package org.bukkit.craftbukkit;
import net.minecraft.server.EntitySnowball;
import org.bukkit.Snowball;
/**
* A snowball.
*
* @author sk89q
*/
public class CraftSnowball extends CraftEntity implements Snowball {
public CraftSnowball(CraftServer server, EntitySnowball ent) {
super(server, ent);
}
}
package org.bukkit.craftbukkit;
import net.minecraft.server.EntitySnowball;
import org.bukkit.entity.Snowball;
/**
* A snowball.
*
* @author sk89q
*/
public class CraftSnowball extends CraftEntity implements Snowball {
public CraftSnowball(CraftServer server, EntitySnowball ent) {
super(server, ent);
}
}

2
src/main/java/org/bukkit/craftbukkit/CraftStorageMinecart.java
Datei anzeigen

@ -3,7 +3,7 @@ package org.bukkit.craftbukkit;
import net.minecraft.server.EntityMinecart;
import org.bukkit.Inventory;
import org.bukkit.StorageMinecart;
import org.bukkit.entity.StorageMinecart;
/**
* A storage minecart.

4
src/main/java/org/bukkit/craftbukkit/CraftVehicle.java
Datei anzeigen

@ -1,7 +1,7 @@
package org.bukkit.craftbukkit;
import org.bukkit.Entity;
import org.bukkit.Vehicle;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Vehicle;
/**
* A vehicle.

12
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
Datei anzeigen

@ -18,16 +18,16 @@ import net.minecraft.server.TileEntity;
import net.minecraft.server.WorldGenBigTree;
import net.minecraft.server.WorldServer;
import net.minecraft.server.WorldGenTrees;
import org.bukkit.Arrow;
import org.bukkit.entity.Arrow;
import org.bukkit.Block;
import org.bukkit.Boat;
import org.bukkit.entity.Boat;
import org.bukkit.Chunk;
import org.bukkit.ItemDrop;
import org.bukkit.entity.ItemDrop;
import org.bukkit.ItemStack;
import org.bukkit.Location;
import org.bukkit.Minecart;
import org.bukkit.PoweredMinecart;
import org.bukkit.StorageMinecart;
import org.bukkit.entity.Minecart;
import org.bukkit.entity.PoweredMinecart;
import org.bukkit.entity.StorageMinecart;
import org.bukkit.Vector;
import org.bukkit.World;