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

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

Browse source 
This reverts commit 7a64e864fc481f001812d78cc4d767872c458706.
This commit is contained in:
sk89q 2011-01-21 18:35:32 -08:00
parent bf9d55d9ed
commit d98c8e2100
2 changed files with 2 additions and 4 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,8 +2,6 @@ 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;
@ -119,7 +117,7 @@ public abstract class Entity {
af.a(0, ((Byte.valueOf((byte) 0)))); af.a(0, ((Byte.valueOf((byte) 0))));
a(); a();
bukkitEntity = new CraftEntity(((WorldServer) l).getServer(), this); // CraftBukkit bukkitEntity = null; // 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 class CraftEntity implements org.bukkit.entity.Entity { public abstract class CraftEntity implements org.bukkit.entity.Entity {
protected final CraftServer server; protected final CraftServer server;
private Entity entity; private Entity entity;