Update Upstream

Removed my ChunkLoadEvent patch as upstream fixed it
This commit is contained in:
Aikar 2018-07-30 01:08:59 -04:00
parent 75d71a2f14
commit 76e1e4d79f
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
42 changed files with 158 additions and 229 deletions

View file

@ -1,14 +1,14 @@
From ac7a0eff76dedc21f1bc6fc1eb0d6cbb367f6f90 Mon Sep 17 00:00:00 2001
From 9275a4d5758169700f30e763bdc4875991a3fbaa 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 28b169d2..9b0f97f1 100644
index ddda34de..f91b3fd3 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -497,4 +497,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -527,4 +527,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@Override
Spigot spigot();
// Spigot end