SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge: conflict resolution and version bump

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-05-15 17:05:45 +10:00
parent b86bbe69d4
commit 77c0da2f07
12 changed files with 64 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0062-Remove-OS-X-Special-Chars-from-Signs.patch
View File

@@ -1,14 +1,14 @@
From f50f2024c1d5ed2fa1a1e3bbb5d4387f4662df84 Mon Sep 17 00:00:00 2001
From 2ec58d554f8e20a7adc0d178d4d320be8bcb2381 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 d90d332..7264dc5 100644
index aba5cad..22cb0a3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1586,6 +1586,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1582,6 +1582,7 @@ public class PlayerConnection implements PacketPlayInListener {
for (j = 0; j < 4; ++j) {
boolean flag = true;