Misc. cleanup from 1.8.4 update
This commit is contained in:
parent
06c96d094f
commit
51360537c1
|
@ -1,5 +1,5 @@
|
||||||
From 2a8b0ca92aee9d8899acdf6ea483e9d16e4da532 Mon Sep 17 00:00:00 2001
|
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
|
Date: Mon, 18 May 2015 17:52:45 -0500
|
||||||
Subject: [PATCH] Player affects spawning API
|
Subject: [PATCH] Player affects spawning API
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ index 3964e3f..6c8e4df 100644
|
||||||
EntityHuman entityhuman = (EntityHuman) iterator.next();
|
EntityHuman entityhuman = (EntityHuman) iterator.next();
|
||||||
|
|
||||||
- if (!entityhuman.isSpectator()) {
|
- if (!entityhuman.isSpectator()) {
|
||||||
+ if (!entityhuman.isSpectator() || !entityhuman.affectsSpawning) { // PaperSpigot) {
|
+ if (!entityhuman.isSpectator() || !entityhuman.affectsSpawning) { // PaperSpigot
|
||||||
int l = MathHelper.floor(entityhuman.locX / 16.0D);
|
int l = MathHelper.floor(entityhuman.locX / 16.0D);
|
||||||
|
|
||||||
j = MathHelper.floor(entityhuman.locZ / 16.0D);
|
j = MathHelper.floor(entityhuman.locZ / 16.0D);
|
||||||
|
|
|
@ -32,7 +32,7 @@ index 7d90de2..d49e833 100644
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ Chunk chunk = this.getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4);
|
+ Chunk chunk = this.getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4);
|
||||||
+ if (chunk != null) {
|
+ if (chunk == null) {
|
||||||
return enumskyblock.c;
|
return enumskyblock.c;
|
||||||
} else {
|
} else {
|
||||||
- Chunk chunk = this.getChunkAtWorldCoords(blockposition);
|
- Chunk chunk = this.getChunkAtWorldCoords(blockposition);
|
||||||
|
|
Loading…
Reference in New Issue