Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update from upstream SpigotMC

Browse Source 
3beb7729816
a77ed5758a7
52c130fc6d9
This commit is contained in:
Zach Brown
2014-12-20 19:09:49 -06:00
parent 5460c17f8a
commit c7f1eed0bf
187 changed files with 251 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CraftBukkit-Patches/0010-Async-Operation-Catching.patch
View File

@@ -1,4 +1,4 @@
From 06a697947e18bc5bdfbe8a498d9ab320ae69bf13 Mon Sep 17 00:00:00 2001
From 2ae2ea254cbba63669fa3227bb1c638ed100e6ed Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@@ -122,7 +122,7 @@ index 486a828..a9ff641 100644
if (generate) {
// Use the default variant of loadChunk when generate == true.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e4d0e41..36469db 100644
index fed7b4d..9268686 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {