Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-24 16:27:12 +10:00
parent a8030addd9
commit b56d35552d
78 changed files with 483 additions and 218 deletions

View File

@@ -1,11 +1,11 @@
From a8d96be1342208847066046da8804175a4f4925d Mon Sep 17 00:00:00 2001
From bf0e4ceeed93592042942a2b81f3e7fe4ddf00d9 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 15 Jan 2014 21:52:47 +0000
Subject: [PATCH] Block data values that crash the client
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 3712009..90f32ed 100644
index 874a089..364df1d 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -115,7 +115,7 @@ public class Chunk {
@@ -44,7 +44,7 @@ index 3712009..90f32ed 100644
if (flag) {
this.initLighting();
} else {
@@ -522,8 +533,9 @@ public class Chunk {
@@ -517,8 +528,9 @@ public class Chunk {
return false;
} else {
this.n = true;