Move async checks to their own patch so we can add more of them.
By: md_5 <md_5@live.com.au>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
From 05108bcbeddcf5681feb3d5f7c986ce738cccbb8 Mon Sep 17 00:00:00 2001
|
||||
From 308eaa2dbd96b59ee9bdc253390679070bfd1533 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 23 Mar 2013 09:39:40 +1100
|
||||
Date: Sat, 23 Mar 2013 17:57:27 +1100
|
||||
Subject: [PATCH] Spigot Changes
|
||||
|
||||
The set of changes which provide core Spigot functionality, which would otherwise be a mess to try and apply individually.
|
||||
@@ -28,9 +28,8 @@ The set of changes which provide core Spigot functionality, which would otherwis
|
||||
.../java/org/bukkit/craftbukkit/CraftWorld.java | 68 ++++++++++++-
|
||||
src/main/java/org/bukkit/craftbukkit/Spigot.java | 20 ++++
|
||||
.../craftbukkit/chunkio/ChunkIOProvider.java | 2 +-
|
||||
.../org/bukkit/craftbukkit/entity/CraftPlayer.java | 7 ++
|
||||
src/main/resources/configurations/bukkit.yml | 25 +++++
|
||||
25 files changed, 392 insertions(+), 78 deletions(-)
|
||||
24 files changed, 385 insertions(+), 78 deletions(-)
|
||||
create mode 100644 src/main/java/org/bukkit/craftbukkit/Spigot.java
|
||||
|
||||
diff --git a/.gitignore b/.gitignore
|
||||
@@ -978,28 +977,6 @@ index 48cf5ba..1d4764c 100644
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 70111e7..1871d3e 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -213,10 +213,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
|
||||
public void kickPlayer(String message) {
|
||||
+ // Spigot start
|
||||
+ kickPlayer(message, false);
|
||||
+ }
|
||||
+
|
||||
+ public void kickPlayer(String message, boolean async){
|
||||
if (getHandle().playerConnection == null) return;
|
||||
+ if (!async && !Bukkit.isPrimaryThread()) throw new IllegalStateException("Cannot kick player from asynchronous thread!"); // Spigot
|
||||
|
||||
getHandle().playerConnection.disconnect(message == null ? "" : message);
|
||||
}
|
||||
+ // Spigot end
|
||||
|
||||
public void setCompassTarget(Location loc) {
|
||||
if (getHandle().playerConnection == null) return;
|
||||
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
|
||||
index 61a95e3..58501ea 100644
|
||||
--- a/src/main/resources/configurations/bukkit.yml
|
||||
|
||||
Reference in New Issue
Block a user