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

Update upstream B/CB/S

Browse Source
This commit is contained in:
Zach Brown
2016-11-24 21:12:18 -06:00
parent ddbf7318b2
commit a68f5fbec0
10 changed files with 36 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0024-Entity-Origin-API.patch
View File

@@ -1,4 +1,4 @@
From d67a5caa6bb6004252668cda3001ccd9180c5e5a Mon Sep 17 00:00:00 2001
From cb0c2ac1cdfc0d75128d4db894e6bf600a8ff0e9 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
@@ -89,7 +89,7 @@ index fd07356..25e471d 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 52171a3..4db969b 100644
index 3d70c50..eb0483d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess {
@@ -106,10 +106,10 @@ index 52171a3..4db969b 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 72fd019..f8aabe2 100644
index e4fbcf2..5b01727 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -672,4 +672,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -675,4 +675,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return spigot;
}
// Spigot end
@@ -155,5 +155,5 @@ index c493c9c..93843aa 100644
+ // Paper end
}
--
2.10.2
2.10.2.windows.1