Update upstream B/CB

This commit is contained in:
Zach Brown
2016-12-16 22:23:03 -06:00
parent 0728696e06
commit 5ff732798d
17 changed files with 65 additions and 65 deletions

View File

@@ -1,4 +1,4 @@
From 4f369a29323103c01bc354522f86e0a7b13ef229 Mon Sep 17 00:00:00 2001
From ee86791d8752389218a188dd920ff3eb860dd9f2 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 bec25e4..30aacc9 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 69aeaca..c8ba375 100644
index 5e09117..11fbe27 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2742,7 +2742,7 @@ public abstract class World implements IBlockAccess {
@@ -2743,7 +2743,7 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);