Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly. This update has been tested to ensure that World Conversion still occurs correctly. Bukkit Changes: 0812ce2c SPIGOT-4397: isChunkGenerated API CraftBukkit Changes: 4824655c SPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 support eea43870 MC-134115: Fix issues converting tile entities 1a7f2d10 SPIGOT-4397: isChunkGenerated API 40aed54d SPIGOT-4396: Improve vehicle movement Spigot Changes: f6a273b1 Rebuild patches
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index c051200da..1328f8889 100644
|
||||
index c051200da8..1328f88898 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -32,7 +32,7 @@ index c051200da..1328f8889 100644
|
||||
|
||||
public int getShieldBlockingDelay() {
|
||||
diff --git a/src/main/java/net/minecraft/server/MovingObjectPosition.java b/src/main/java/net/minecraft/server/MovingObjectPosition.java
|
||||
index 6d5dbe89a..a31f9f607 100644
|
||||
index 6d5dbe89a6..a31f9f6072 100644
|
||||
--- a/src/main/java/net/minecraft/server/MovingObjectPosition.java
|
||||
+++ b/src/main/java/net/minecraft/server/MovingObjectPosition.java
|
||||
@@ -0,0 +0,0 @@ public class MovingObjectPosition {
|
||||
@@ -44,7 +44,7 @@ index 6d5dbe89a..a31f9f607 100644
|
||||
return this.e;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
index 0860f2334..028495700 100644
|
||||
index 0860f2334d..028495700f 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
|
||||
Reference in New Issue
Block a user