SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port to new mc-dev format.

Browse Source 
By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
CraftBukkit/Spigot
2011-01-29 22:50:29 +01:00
parent 785e22677c
commit 6820f5de76
14 changed files with 84 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
View File

@@ -1,12 +1,12 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityAnimals;
import net.minecraft.server.EntityAnimal;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Animals;
public class CraftAnimals extends CraftCreature implements Animals{
public CraftAnimals(CraftServer server, EntityAnimals entity) {
public CraftAnimals(CraftServer server, EntityAnimal entity) {
super(server, entity);
}

14
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@@ -17,21 +17,21 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
public Location getLocation() {
return new Location(getWorld(), entity.p, entity.q, entity.r, entity.v, entity.w);
return new Location(getWorld(), entity.locX, entity.locY, entity.locZ, entity.yaw, entity.pitch);
}
public Vector getVelocity() {
return new Vector(entity.s, entity.t, entity.u);
return new Vector(entity.motX, entity.motY, entity.motZ);
}
public void setVelocity(Vector vel) {
entity.s = vel.getX();
entity.t = vel.getY();
entity.u = vel.getZ();
entity.motX = vel.getX();
entity.motY = vel.getY();
entity.motZ = vel.getZ();
}
public World getWorld() {
return ((WorldServer)entity.l).getWorld();
return ((WorldServer)entity.world).getWorld();
}
public void teleportTo(Location location) {
@@ -43,7 +43,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
public int getEntityId() {
return entity.g;
return entity.id;
}
public Entity getHandle() {

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java
View File

@@ -1,13 +1,13 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityZombieSimple;
import net.minecraft.server.EntityGiantZombie;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Giant;
public class CraftGiant extends CraftMonster implements Giant {
public CraftGiant(CraftServer server, EntityZombieSimple entity) {
public CraftGiant(CraftServer server, EntityGiantZombie entity) {
super(server, entity);
}

18
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View File

@@ -1,7 +1,7 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityPlayer;
import net.minecraft.server.EntityHuman;
import org.bukkit.entity.HumanEntity;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
@@ -10,28 +10,28 @@ import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.craftbukkit.CraftServer;
public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
private EntityPlayer entity;
private EntityHuman entity;
private CraftInventoryPlayer inventory;
public CraftHumanEntity(final CraftServer server, final EntityPlayer entity) {
public CraftHumanEntity(final CraftServer server, final EntityHuman entity) {
super(server, entity);
this.entity = entity;
this.inventory = new CraftInventoryPlayer( entity.an );
this.inventory = new CraftInventoryPlayer( entity.inventory );
}
public String getName() {
return entity.aw;
return entity.name;
}
@Override
public EntityPlayer getHandle() {
public EntityHuman getHandle() {
return entity;
}
public void setHandle(final EntityPlayer entity) {
super.setHandle((EntityPlayer)entity);
public void setHandle(final EntityHuman entity) {
super.setHandle((EntityHuman)entity);
this.entity = entity;
this.inventory = new CraftInventoryPlayer( entity.an );
this.inventory = new CraftInventoryPlayer( entity.inventory );
}
public CraftInventoryPlayer getInventory() {

14
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View File

@@ -24,7 +24,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
public int getHealth() {
return entity.aZ;
return entity.health;
}
public void setHealth(int health) {
@@ -32,7 +32,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
throw new IllegalArgumentException("Health must be between 0 and 200");
}
entity.aZ = health;
entity.health = health;
}
@Override
@@ -72,11 +72,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
public boolean isInsideVehicle() {
return entity.k != null;
return entity.vehicle != null;
}
public boolean leaveVehicle() {
if (entity.k == null) {
if (entity.vehicle == null) {
return false;
}
@@ -85,13 +85,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
public Vehicle getVehicle() {
if (entity.k == null) {
if (entity.vehicle == null) {
return null;
}
org.bukkit.entity.Entity vehicle = (entity.k.getBukkitEntity());
org.bukkit.entity.Entity vehicle = (entity.vehicle.getBukkitEntity());
if (vehicle instanceof Vehicle) {
return (Vehicle)vehicle;
return (Vehicle) vehicle;
}
return null;

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java
View File

@@ -1,13 +1,13 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityMobs;
import net.minecraft.server.EntityMonster;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Monster;
public class CraftMonster extends CraftCreature implements Monster {
public CraftMonster(CraftServer server, EntityMobs entity) {
public CraftMonster(CraftServer server, EntityMonster entity) {
super(server, entity);
}

16
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -2,8 +2,8 @@ package org.bukkit.craftbukkit.entity;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import net.minecraft.server.EntityHuman;
import net.minecraft.server.EntityPlayer;
import net.minecraft.server.EntityPlayerMP;
import net.minecraft.server.Packet;
import net.minecraft.server.Packet3Chat;
import net.minecraft.server.Packet6SpawnPosition;
@@ -12,10 +12,10 @@ import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Player;
public class CraftPlayer extends CraftHumanEntity implements Player {
private EntityPlayerMP entity;
private EntityPlayer entity;
private String name;
public CraftPlayer(CraftServer server, EntityPlayerMP entity) {
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
this.name = getName();
this.entity = entity;
@@ -31,8 +31,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean isOnline() {
for (Object obj: server.getHandle().b) {
EntityPlayerMP player = (EntityPlayerMP) obj;
if (player.aw.equalsIgnoreCase(getName())) {
EntityPlayer player = (EntityPlayer) obj;
if (player.name.equalsIgnoreCase(getName())) {
return true;
}
}
@@ -49,12 +49,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
@Override
public EntityPlayerMP getHandle() {
public EntityPlayer getHandle() {
return entity;
}
public void setHandle(final EntityPlayerMP entity) {
super.setHandle((EntityPlayer) entity);
public void setHandle(final EntityPlayer entity) {
super.setHandle((EntityHuman) entity);
this.entity = entity;
}

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java
View File

@@ -15,7 +15,7 @@ public abstract class CraftVehicle extends CraftEntity implements Vehicle {
}
public Entity getPassenger() {
return isEmpty()?null:(getHandle().j.getBukkitEntity());
return isEmpty() ? null : (getHandle().passenger.getBukkitEntity());
}
public boolean setPassenger(Entity passenger) {
@@ -28,15 +28,15 @@ public abstract class CraftVehicle extends CraftEntity implements Vehicle {
}
public boolean isEmpty() {
return getHandle().j == null;
return getHandle().passenger == null;
}
public boolean eject() {
if (getHandle().j == null) {
if (getHandle().passenger == null) {
return false;
}
getHandle().j.setPassengerOf(null);
getHandle().passenger.setPassengerOf(null);
return true;
}
}

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
View File

@@ -1,13 +1,13 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityWaterMob;
import net.minecraft.server.EntityWaterAnimal;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.WaterMob;
public class CraftWaterMob extends CraftCreature implements WaterMob {
public CraftWaterMob(CraftServer server, EntityWaterMob entity) {
public CraftWaterMob(CraftServer server, EntityWaterAnimal entity) {
super(server, entity);
}