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

Update B/CB/S

Browse Source
This commit is contained in:
Shane Freeder
2017-11-08 16:13:57 +00:00
parent d1d4f3b465
commit 1d03f56bd6
38 changed files with 216 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Spigot-Server-Patches/0023-Entity-Origin-API.patch
View File

@@ -1,22 +1,22 @@
From 0a357cb9c574fa7812c4b90a4b59cc2c8082bdcd Mon Sep 17 00:00:00 2001
From 7a10da3fb20eb14e2662924c5a7d4b94809777cf 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 86c946119..acadeae93 100644
index 90be49189..00487dd5f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -148,6 +148,7 @@ public abstract class Entity implements ICommandListener {
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
@@ -149,6 +149,7 @@ public abstract class Entity implements ICommandListener {
public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
public boolean forceExplosionKnockback; // SPIGOT-949
public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper
+ public Location origin; // Paper
// Spigot start
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
@@ -1539,6 +1540,11 @@ public abstract class Entity implements ICommandListener {
@@ -1545,6 +1546,11 @@ public abstract class Entity implements ICommandListener {
}
}
@@ -28,7 +28,7 @@ index 86c946119..acadeae93 100644
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
@@ -1683,6 +1689,13 @@ public abstract class Entity implements ICommandListener {
@@ -1689,6 +1695,13 @@ public abstract class Entity implements ICommandListener {
}
// CraftBukkit end
@@ -42,7 +42,7 @@ index 86c946119..acadeae93 100644
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
@@ -1707,6 +1720,7 @@ public abstract class Entity implements ICommandListener {
@@ -1713,6 +1726,7 @@ public abstract class Entity implements ICommandListener {
protected abstract void b(NBTTagCompound nbttagcompound);
@@ -101,7 +101,7 @@ index bc6383669..ca9eb2f3b 100644
if (i >= 0 && i < this.list.size()) {
NBTBase nbtbase = (NBTBase) this.list.get(i);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 27f428efa..3298cbe6b 100644
index a35f714eb..957e0101e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1025,6 +1025,12 @@ public abstract class World implements IBlockAccess {
@@ -118,10 +118,10 @@ index 27f428efa..3298cbe6b 100644
flag = true;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 30641581a..9ee7593b2 100644
index 51cc15e79..fa2bdabc6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -749,4 +749,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -754,4 +754,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return spigot;
}
// Spigot end
@@ -135,5 +135,5 @@ index 30641581a..9ee7593b2 100644
+ // Paper end
}
--
2.13.3.windows.1
2.14.3