twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-10 17:52:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 646c98c7d7
commit 61d5d29069
9 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch
View File

@@ -1,4 +1,4 @@
From 73b525dd39781dca706193081dc4abd689c59ba9 Mon Sep 17 00:00:00 2001
From 2fb681c8b6ec9f26b4a3f43de21e39dc1b44e316 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 11:54:32 +1000
Subject: [PATCH] Prevent Shutdown Hang
@@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Shutdown Hang
Prevents server hanging if players disconnect during the shutdown sequence.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index fa3e65c..b6a3d2b 100644
index 8b3d757..794bedd 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1125,8 +1125,15 @@ public abstract class PlayerList {
@@ -1129,8 +1129,15 @@ public abstract class PlayerList {
}
public void r() {