Update upstream CB

This commit is contained in:
Zach Brown
2016-03-25 02:30:39 -05:00
parent 074838e0f3
commit dab9d40bfd
6 changed files with 27 additions and 27 deletions

View File

@@ -1,4 +1,4 @@
From ee39ef5ad66dbdc6f970a9257efdef116712b3fe Mon Sep 17 00:00:00 2001
From 93881570845dac907b09471b5dbdefec903fbdf2 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
@@ -65,10 +65,10 @@ index 9e19dfd..b724586 100644
biomebase_biomemeta = worldserver.a(enumcreaturetype, (BlockPosition) blockposition_mutableblockposition);
if (biomebase_biomemeta == null) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 378d71b..0d7e962 100644
index 17c0b00..9124558 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2682,6 +2682,53 @@ public abstract class World implements IBlockAccess {
@@ -2688,6 +2688,53 @@ public abstract class World implements IBlockAccess {
return i;
}
@@ -146,5 +146,5 @@ index 90de39a..4bf9c71 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.7.1.windows.2
2.7.4