2f782a6652
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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From b6051f40676a302b516d17ac4bff7d6d7c727bc3 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.21.0
|
|
|