mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 19:15:32 +01:00
e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 28c01fd1a4550e06222223cc31bdfc06cee5c664 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 10 Aug 2018 22:11:49 -0400
|
|
Subject: [PATCH] Make EnderDragon implement Mob
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
|
|
index cc115cc368..4947249da2 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
|
|
@@ -1,17 +1,18 @@
|
|
package org.bukkit.craftbukkit.entity;
|
|
|
|
+import net.minecraft.server.EntityInsentient;
|
|
import net.minecraft.server.EntityLiving;
|
|
import org.bukkit.craftbukkit.CraftServer;
|
|
import org.bukkit.entity.ComplexLivingEntity;
|
|
|
|
-public abstract class CraftComplexLivingEntity extends CraftLivingEntity implements ComplexLivingEntity {
|
|
- public CraftComplexLivingEntity(CraftServer server, EntityLiving entity) {
|
|
+public abstract class CraftComplexLivingEntity extends CraftMob implements ComplexLivingEntity { // Paper
|
|
+ public CraftComplexLivingEntity(CraftServer server, EntityInsentient entity) { // Paper
|
|
super(server, entity);
|
|
}
|
|
|
|
@Override
|
|
- public EntityLiving getHandle() {
|
|
- return (EntityLiving) entity;
|
|
+ public EntityInsentient getHandle() { // Paper
|
|
+ return (EntityInsentient) entity; // Paper
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.25.1
|
|
|