core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream B/CB/S

This commit is contained in:
Zach Brown 2016-11-12 20:21:46 -06:00
parent 3456f7017b
commit 65538782cd
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 542ce731cfb33acb2fce81a466b20e2e121ab269 Mon Sep 17 00:00:00 2001
From 9bfa695b5dc689ed703dd12078257d3411799997 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 17:50:31 -0600
Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index cbcc835..27b429e 100644
index 5c64b79..23524b8 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -435,4 +435,15 @@ public interface Entity extends Metadatable, CommandSender {
@@ -463,4 +463,15 @@ public interface Entity extends Metadatable, CommandSender {
Spigot spigot();
// Spigot End
@ -61,5 +61,5 @@ index 3ce322d..69df487 100644
+ public org.bukkit.Location getSourceLoc();
}
--
2.10.0.windows.1
2.10.2

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

@ -1,4 +1,4 @@
From 4bb47c60de037d0bcb5a0714eb4ebe20d1e52f1b Mon Sep 17 00:00:00 2001
From 3febea393a161f09bef588e1b62c721860f1b0ec 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
@ -106,10 +106,10 @@ index e3d971c..5b3e50c 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 b35f713..c8435a3 100644
index 09523de..a24efd9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -635,4 +635,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -650,4 +650,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.1.windows.1
2.10.2

2
work/Bukkit

@ -1 +1 @@
Subproject commit b80e520acb9f3e5a14a92a06c08c470290b323cb
Subproject commit 570e0e67528698b67770ea12e22c82d937fd3080

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 33071ecfffad01854afcf4e05b8e58e4e9fe7239
Subproject commit 51263e97187a84338f89698eef187284055a682a

2
work/Spigot

@ -1 +1 @@
Subproject commit 72c26058df3d4c3a8d2e2b3255d3a032623a01f0
Subproject commit de459a282d9f494bbc5588b461b3e8eacd74f744