Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

[Auto] Updated Upstream (CraftBukkit/Spigot)

Browse Source 
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:
049120068 SPIGOT-6101: Store persist state of entities
0de8365dd SPIGOT-6103: Summoning an Eye of Ender throw an Error

Spigot Changes:
b5a13e6d Rebuild patches
This commit is contained in:
Aikar
2020-08-26 04:46:59 -04:00
parent 655258b339
commit 20fc1b5c2a
24 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0025-Entity-Origin-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 6b4f38c6528a0a730f31eff3204d741e9b4a2ae2..7cfd035d2baa4318c306cd850ea49468ac213792 100644
index da1586b21ee12a28b66410fde09395bc044c26d0..d21106a96356032f1e183c75f020dc61d18d79fd 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -164,6 +164,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index 6b4f38c6528a0a730f31eff3204d741e9b4a2ae2..7cfd035d2baa4318c306cd850ea49468
// Spigot start
public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
@@ -1536,6 +1537,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1539,6 +1540,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.bukkitEntity.storeBukkitValues(nbttagcompound);
}
// CraftBukkit end
@@ -28,7 +28,7 @@ index 6b4f38c6528a0a730f31eff3204d741e9b4a2ae2..7cfd035d2baa4318c306cd850ea49468
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
@@ -1652,6 +1658,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1656,6 +1662,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.getBukkitEntity().readBukkitValues(nbttagcompound);
// CraftBukkit end
@@ -42,7 +42,7 @@ index 6b4f38c6528a0a730f31eff3204d741e9b4a2ae2..7cfd035d2baa4318c306cd850ea49468
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
@@ -1713,6 +1726,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1717,6 +1730,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
protected abstract void saveData(NBTTagCompound nbttagcompound);