Merge in some stuff

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-14 17:58:22 +11:00
parent 098db09224
commit 5cd48cf621
14 changed files with 54 additions and 54 deletions

View File

@@ -1,14 +1,14 @@
From 51de2389798d132adf7dee48679106e330af84bc Mon Sep 17 00:00:00 2001
From 1ba7c07ce2746c0bbf748599aed3b6800a50d561 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 ff91fd3..2f45a3e 100644
index 97f0abd..d7dbc54 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1550,6 +1550,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1559,6 +1559,7 @@ public class PlayerConnection implements PacketPlayInListener {
for (j = 0; j < 4; ++j) {
boolean flag = true;