mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix some merge conflicts

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot 2014-03-23 15:21:51 +11:00
commit 61d5d29069
9 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CraftBukkit-Patches/0110-Unfinalize-the-isDisconnected-method-by-bukkit.patch
View file

@ -1,4 +1,4 @@
From 1014e7b0cb8a6166b14ed4343d6bfda56fb14cd4 Mon Sep 17 00:00:00 2001
From f78a24b5f6db5880964917c9d66605f1754e7b27 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,7 +6,7 @@ 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 60d0f54..3d03320 100644
index eb5b84e..ed144b5 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1892,7 +1892,7 @@ public class PlayerConnection implements PacketPlayInListener {
@ -15,9 +15,9 @@ index 60d0f54..3d03320 100644
// CraftBukkit start - Add "isDisconnected" method
- public final boolean isDisconnected() {
+ public boolean isDisconnected() {
return !NetworkManager.a(this.networkManager).config().isAutoRead();
return !this.player.joining && !NetworkManager.a(this.networkManager).config().isAutoRead();
}
// CraftBukkit end
--
1.8.5.2.msysgit.0
1.8.3.2