Update again - git isn't as smart as he looks

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-03 14:16:28 +10:00
parent bbcec2f9af
commit 70bd8275d1
4 changed files with 16 additions and 16 deletions

View File

@@ -1,4 +1,4 @@
From 20ac68be1e39187e6c5f68d20619c86bacd05cb9 Mon Sep 17 00:00:00 2001
From 2ca037f07251ec82625905573ff1926563aacbdc Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 7 Mar 2013 20:12:46 +1100
Subject: [PATCH] Async Operation Catching
@@ -102,10 +102,10 @@ index 4c16040..8508d22 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 1d97430..b3bb702 100644
index 5628d84..5bf0e3c 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 {
@@ -215,6 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void kickPlayer(String message) {