Update upstream CB

Closes GH-556
This commit is contained in:
Zach Brown
2016-12-27 18:46:41 -06:00
parent f63a055b8b
commit 1870320545
14 changed files with 62 additions and 62 deletions

View File

@@ -1,11 +1,11 @@
From 743556defa9299e57321d3c0f19e096653ca5b9c Mon Sep 17 00:00:00 2001
From 2541e7a0b8cc0b9af75632151f1b327f6288e18e 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
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 4a5ebbd..e807160 100644
index ec8f581..43e28d6 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -63,6 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -57,10 +57,10 @@ index 17bf3e4..a05fad5 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 708de3d..a1da835 100644
index b9b13c7..688f405 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2724,7 +2724,7 @@ public abstract class World implements IBlockAccess {
@@ -2719,7 +2719,7 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);