Update upstream

This commit is contained in:
Aikar
2017-12-09 12:37:09 -05:00
parent eefbd63ea9
commit ad40e694a3
22 changed files with 107 additions and 107 deletions

View File

@@ -1,4 +1,4 @@
From e4318dc2a3a2974522740ce1aec6e299ebf26cb6 Mon Sep 17 00:00:00 2001
From 431256683eff92a78786d888c39861a814291811 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 eb27d080c..a35f714eb 100644
index 759964b0f..26d4bd690 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2729,7 +2729,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 f387b623d..fa91ecbef 100644
// Spigot start
--
2.15.0
2.15.1