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

Update upstream B/CB

Browse Source
This commit is contained in:
Zach Brown
2016-09-04 16:59:06 -05:00
parent e153f46603
commit eb7e4424fa
10 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/0026-Entity-Origin-API.patch
View File

@@ -1,11 +1,11 @@
From 04d506ad53de647f48493f06fbd2ecea6465f0fb Mon Sep 17 00:00:00 2001
From fbab4ca7a4c094c2b6f537d701af390f8e33c8cc Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 23:45:08 -0600
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 1e85d39..395811a 100644
index c35f073..38df1c6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -145,6 +145,7 @@ public abstract class Entity implements ICommandListener {
@@ -16,7 +16,7 @@ index 1e85d39..395811a 100644
// Spigot start
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
@@ -1373,6 +1374,11 @@ public abstract class Entity implements ICommandListener {
@@ -1371,6 +1372,11 @@ public abstract class Entity implements ICommandListener {
}
}
@@ -28,7 +28,7 @@ index 1e85d39..395811a 100644
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
@@ -1517,6 +1523,13 @@ public abstract class Entity implements ICommandListener {
@@ -1515,6 +1521,13 @@ public abstract class Entity implements ICommandListener {
}
// CraftBukkit end
@@ -42,7 +42,7 @@ index 1e85d39..395811a 100644
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
@@ -1538,6 +1551,7 @@ public abstract class Entity implements ICommandListener {
@@ -1536,6 +1549,7 @@ public abstract class Entity implements ICommandListener {
protected abstract void b(NBTTagCompound nbttagcompound);
@@ -155,5 +155,5 @@ index c493c9c..93843aa 100644
+ // Paper end
}
--
2.9.2.windows.1
2.10.0.windows.1