Update upstream

This commit is contained in:
Aikar
2018-04-22 10:40:36 -04:00
parent a144c203fc
commit a72fc26fc1
17 changed files with 61 additions and 115 deletions

View File

@@ -1,4 +1,4 @@
From dd9ac394c58c1de582f03216bf52206b71b6bd19 Mon Sep 17 00:00:00 2001
From 620959a6b7c23480d69b886a164cb12185d59a9f Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API
@@ -57,10 +57,10 @@ index a599a043d..1c7c187c7 100644
j = MathHelper.floor(entityhuman.locZ / 16.0D);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3cdbedf14..b2b82d520 100644
index 759964b0f..26d4bd690 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2731,7 +2731,7 @@ public abstract class World implements IBlockAccess {
@@ -2727,7 +2727,7 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
@@ -91,5 +91,5 @@ index 916781403..9e8ca0fbd 100644
// Spigot start
--
2.14.3
2.17.0