SteamWar/Paper
10
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/0103-Unfinalize-the-isDisconnected-method-by-bukkit.patch
View File

@@ -1,4 +1,4 @@
From 341c258ef803001921a1e91a74d36053dd64884f Mon Sep 17 00:00:00 2001
From 9eea6333eb760d6e38a536ffabc0cc91ddf36ca9 Mon Sep 17 00:00:00 2001
From: hcherndon <hcherndon@gmail.com>
Date: Sat, 15 Feb 2014 01:51:20 -0600
Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cc7457f..652f7a1 100644
index aac1449..e88118f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1887,7 +1887,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1883,7 +1883,7 @@ public class PlayerConnection implements PacketPlayInListener {
}
// CraftBukkit start - Add "isDisconnected" method