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,4 +1,4 @@
From 291d52ba09c9f3c0d718845f8050406fd67f3298 Mon Sep 17 00:00:00 2001
From 4721d9011f520f9764d8dd4d429e2d000f57a859 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 16 May 2013 18:51:05 +1000
Subject: [PATCH] Orebfuscator
@@ -115,10 +115,10 @@ index 2db45ad..97fe53c 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 2f7be96..7485d07 100644
index 6da7de6..2de7e62 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -458,6 +458,7 @@ public abstract class World implements IBlockAccess {
@@ -548,6 +548,7 @@ public abstract class World implements IBlockAccess {
this.e(i, j + 1, k, block);
this.e(i, j, k - 1, block);
this.e(i, j, k + 1, block);