Update Upstream

This commit is contained in:
Aikar 2016-06-04 11:41:04 -04:00
parent e4e87d78ae
commit f4a43ec92d
5 changed files with 12 additions and 12 deletions

View file

@ -1,14 +1,14 @@
From 80f0b1f242c4e32979a05cc74f0e482c2fdbc0fa Mon Sep 17 00:00:00 2001
From e1bfb9a5ac6112089f5a13e5b8db381c4d872bcf 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 e5fc22a..ef6d467 100644
index 8837641..713add6 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -391,4 +391,15 @@ public interface Entity extends Metadatable, CommandSender {
@@ -407,4 +407,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.8.0
2.8.3