Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-02-12 13:48:26 +00:00
parent 8a02a8d067
commit 7073c502e9
75 changed files with 299 additions and 753 deletions

View File

@@ -1,14 +1,14 @@
From 48e13501d3e0d30e4bcc0a875894254e87f5029b Mon Sep 17 00:00:00 2001
From 054f1855d4ff3344c64b9e7d53b2ca6b46637a95 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 8 Dec 2013 16:52:42 +1100
Subject: [PATCH] Remove OS X Special Chars from Signs
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 733b9d3..a462492 100644
index 0fa731e..c9585fc 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1552,6 +1552,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1572,6 +1572,7 @@ public class PlayerConnection implements PacketPlayInListener {
for (j = 0; j < 4; ++j) {
boolean flag = true;
@@ -17,5 +17,5 @@ index 733b9d3..a462492 100644
if (packetplayinupdatesign.f()[j].length() > 15) {
flag = false;
--
1.8.3.2
1.8.4.msysgit.0