OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 04:02:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Entity's bukkitEntity field now holds a CraftEntity by default.

Browse source
This commit is contained in:
sk89q 2011-01-21 16:21:19 -08:00
parent efdf9b8af7
commit 3931be421e
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/minecraft/server/Entity.java
View file

@ -2,6 +2,8 @@ package net.minecraft.server;
// CraftBukkit start // CraftBukkit start
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.event.Event.Type; import org.bukkit.event.Event.Type;
import org.bukkit.event.entity.EntityCombustEvent; import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageByBlockEvent;
@ -117,7 +119,7 @@ public abstract class Entity {
af.a(0, ((Byte.valueOf((byte) 0)))); af.a(0, ((Byte.valueOf((byte) 0))));
a(); a();
bukkitEntity = null; // CraftBukkit bukkitEntity = new CraftEntity(((WorldServer) l).getServer(), this); // CraftBukkit
} }
protected abstract void a(); protected abstract void a();

2
src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View file

@ -7,7 +7,7 @@ import org.bukkit.World;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
public abstract class CraftEntity implements org.bukkit.entity.Entity { public class CraftEntity implements org.bukkit.entity.Entity {
protected final CraftServer server; protected final CraftServer server;
private Entity entity; private Entity entity;