Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-03 06:47:34 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream B/CB/S

Browse Source
This commit is contained in:
Zach Brown 2016-10-01 11:47:56 -05:00
parent 9e6cbc5203
commit 18799efd0d
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
5 changed files with 10 additions and 10 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 3ce5b4bd388da96e7866319ee200652797a3b74b Mon Sep 17 00:00:00 2001 From 542ce731cfb33acb2fce81a466b20e2e121ab269 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 17:50:31 -0600 Date: Mon, 29 Feb 2016 17:50:31 -0600
Subject: [PATCH] Entity Origin API 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 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index aa7cc17..434334a 100644 index cbcc835..27b429e 100644
--- a/src/main/java/org/bukkit/entity/Entity.java --- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -421,4 +421,15 @@ public interface Entity extends Metadatable, CommandSender { @@ -435,4 +435,15 @@ public interface Entity extends Metadatable, CommandSender {
Spigot spigot(); Spigot spigot();
// Spigot End // Spigot End
@ -61,5 +61,5 @@ index 3ce322d..69df487 100644
+ public org.bukkit.Location getSourceLoc(); + public org.bukkit.Location getSourceLoc();
} }
-- --
2.8.3 2.10.0.windows.1

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

@ -1,4 +1,4 @@
From ed3cf379c0f5d770f5cf271899c9e6e86803d915 Mon Sep 17 00:00:00 2001 From e11d76d146840a3175c0ed3bd4214367883b0079 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 23:45:08 -0600 Date: Tue, 1 Mar 2016 23:45:08 -0600
Subject: [PATCH] Entity Origin API Subject: [PATCH] Entity Origin API
@ -106,10 +106,10 @@ index e3d971c..5b3e50c 100644
flag = true; flag = true;
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index fd3b39c..6f6b90b 100644 index b35f713..c8435a3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -625,4 +625,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -635,4 +635,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return spigot; return spigot;
} }
// Spigot end // Spigot end

2
work/Bukkit

@ -1 +1 @@
Subproject commit 9d85e3f475303d7f5bfe8e8b5dee1bd8509ec838 Subproject commit 450225fe17a930d7bb0de2d646c4a892d5bdcd7e

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit c1b529eddc72b313fcc81c9d55b6b06200d4becb Subproject commit ae93d4fb492bc737466666087dcd49c9f775e40c

2
work/Spigot

@ -1 +1 @@
Subproject commit 570526c2b4840753183aa81995ea81008238eeb2 Subproject commit 047f737bbf62d3a396c317a58fd9b4034603ee00