diff --git a/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitEntity.java b/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitEntity.java
new file mode 100644
index 0000000..38d1bfe
--- /dev/null
+++ b/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitEntity.java
@@ -0,0 +1,21 @@
+package org.patchbukkit.entity;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.patchbukkit.PatchBukkitServer;
+
+public class PatchBukkitEntity implements Entity {
+
+    protected final PatchBukkitServer server;
+    protected Entity entity;
+    private final EntityType entityType;
+
+    public PatchBukkitEntity(
+        final PatchBukkitServer server,
+        final Entity entity
+    ) {
+        this.server = server;
+        this.entity = entity;
+        this.entityType = CraftEntityType.minecraftToBukkit(entity.getType());
+    }
+}
diff --git a/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitHumanEntity.java b/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitHumanEntity.java
new file mode 100644
index 0000000..07649e0
--- /dev/null
+++ b/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitHumanEntity.java
@@ -0,0 +1,7 @@
+package org.patchbukkit.entity;
+
+import org.bukkit.entity.HumanEntity;
+
+public class PatchBukkitHumanEntity
+    extends PatchBukkitLivingEntity
+    implements HumanEntity {}
diff --git a/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitLivingEntity.java b/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitLivingEntity.java
new file mode 100644
index 0000000..59558d8
--- /dev/null
+++ b/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitLivingEntity.java
@@ -0,0 +1,7 @@
+package org.patchbukkit.entity;
+
+import org.bukkit.entity.LivingEntity;
+
+public class PatchBukkitLivingEntity
+    extends PatchBukkitEntity
+    implements LivingEntity {}
diff --git a/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitPlayer.java b/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitPlayer.java
new file mode 100644
index 0000000..ce7a5a0
--- /dev/null
+++ b/java/patchbukkit/src/main/java/org/patchbukkit/entity/PatchBukkitPlayer.java
@@ -0,0 +1,7 @@
+package org.patchbukkit.entity;
+
+import org.bukkit.entity.Player;
+
+public class PatchBukkitPlayer
+    extends PatchBukkitHumanEntity
+    implements Player {}