Update upstream B/CB/S

This commit is contained in:
Zach Brown 2018-10-27 00:02:22 -04:00
parent b1ab9ad452
commit c4865a6445
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
57 changed files with 380 additions and 386 deletions

View file

@ -1,14 +1,14 @@
From 573401ed73ea3117352b8c823b91e807052363c3 Mon Sep 17 00:00:00 2001
From 863ed563e69f6e02d31354d301825cfc27f89b58 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index a2714118..6bdbd7ab 100644
index d793de62..08399637 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -556,5 +556,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -567,5 +567,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
* @return Location where entity originates or null if not yet added
*/
Location getOrigin();
@ -22,5 +22,5 @@ index a2714118..6bdbd7ab 100644
// Paper end
}
--
2.19.0
2.19.1