Update upstream B/CB/S

This commit is contained in:
Zach Brown 2017-06-12 22:28:09 -05:00
parent cce9b7a866
commit 2b51986c25
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
6 changed files with 13 additions and 13 deletions

View file

@ -1,14 +1,14 @@
From be3a8fec9af1e3d9ee43646c8572b98cf80721b4 Mon Sep 17 00:00:00 2001
From 5992f37d03b1b4cf413785d1b9e716a1b48de5da 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 0144bef9..fbff9860 100644
index e454e70a..c86c1c5f 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -487,4 +487,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -495,4 +495,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@Override
Spigot spigot();
// Spigot end