summaryrefslogtreecommitdiffstats
path: root/nms-patches/BiomeDecorator.patch
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-12-12 19:27:37 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-12-12 19:27:37 +0000
commit64157d1de5c34fb3b64297348d7b0e17c5aec4ab (patch)
tree55e7dd4687081fdf94bbf462b21a9728babbac80 /nms-patches/BiomeDecorator.patch
parent54888dfafbe296594d421301fc80227effc1a83d (diff)
downloadcraftbukkit-64157d1de5c34fb3b64297348d7b0e17c5aec4ab.tar
craftbukkit-64157d1de5c34fb3b64297348d7b0e17c5aec4ab.tar.gz
craftbukkit-64157d1de5c34fb3b64297348d7b0e17c5aec4ab.tar.lz
craftbukkit-64157d1de5c34fb3b64297348d7b0e17c5aec4ab.tar.xz
craftbukkit-64157d1de5c34fb3b64297348d7b0e17c5aec4ab.zip
SPIGOT-189: Remove ListenerWrapper in favour of just doing it in EntityPlayer
Diffstat (limited to 'nms-patches/BiomeDecorator.patch')
-rw-r--r--nms-patches/BiomeDecorator.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/BiomeDecorator.patch b/nms-patches/BiomeDecorator.patch
index 91b04ca2..b7929ee0 100644
--- a/nms-patches/BiomeDecorator.patch
+++ b/nms-patches/BiomeDecorator.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/BiomeDecorator.java Tue Dec 2 23:22:43 2014
-+++ src/main/java/net/minecraft/server/BiomeDecorator.java Tue Dec 2 23:22:34 2014
+--- ../work/decompile-8eb82bde/net/minecraft/server/BiomeDecorator.java 2014-12-12 19:26:13.625913570 +0000
++++ src/main/java/net/minecraft/server/BiomeDecorator.java 2014-12-12 19:15:22.000000000 +0000
@@ -132,7 +132,7 @@
WorldGenTreeAbstract worldgentreeabstract = biomebase.a(this.b);
@@ -120,11 +120,10 @@
this.x.generate(this.a, this.b, this.c.a(k, i1, l));
}
-@@ -273,6 +273,16 @@
- }
+@@ -274,6 +274,16 @@
}
-+
+
+ // CraftBukkit start - The heightMap can be wrong calculated and return Y = 0 which will crash the Server
+ private BlockPosition getHighestBlockYAt( BlockPosition blockPosition ) {
+ BlockPosition returnBlockPosition = this.a.getHighestBlockYAt( blockPosition );
@@ -134,6 +133,7 @@
+ return returnBlockPosition;
+ }
+ // CraftBukkit end
-
++
protected void a(int i, WorldGenerator worldgenerator, int j, int k) {
int l;
+