Misc. cleanup from 1.8.4 update

This commit is contained in:
Zach Brown 2015-05-18 19:22:48 -05:00
parent 06c96d094f
commit 51360537c1
2 changed files with 3 additions and 3 deletions

View File

@ -1,5 +1,5 @@
From 2a8b0ca92aee9d8899acdf6ea483e9d16e4da532 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Mon, 18 May 2015 17:52:45 -0500
Subject: [PATCH] Player affects spawning API
@ -51,7 +51,7 @@ index 3964e3f..6c8e4df 100644
EntityHuman entityhuman = (EntityHuman) iterator.next();
- if (!entityhuman.isSpectator()) {
+ if (!entityhuman.isSpectator() || !entityhuman.affectsSpawning) { // PaperSpigot) {
+ if (!entityhuman.isSpectator() || !entityhuman.affectsSpawning) { // PaperSpigot
int l = MathHelper.floor(entityhuman.locX / 16.0D);
j = MathHelper.floor(entityhuman.locZ / 16.0D);

View File

@ -32,7 +32,7 @@ index 7d90de2..d49e833 100644
+ }
+
+ Chunk chunk = this.getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4);
+ if (chunk != null) {
+ if (chunk == null) {
return enumskyblock.c;
} else {
- Chunk chunk = this.getChunkAtWorldCoords(blockposition);