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 9851a70c8386c432d36d0ddc9a8c4851b969f92d Mon Sep 17 00:00:00 2001
From f71f95a3cdcc53fec5d01450691202e21360ae08 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support
@@ -59,10 +59,10 @@ index f87ebf9..f5032be 100644
event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage());
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b3bb702..b81a07e 100644
index 5bf0e3c..8af2934 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1002,6 +1002,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1015,6 +1015,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Spigot spigot = new Spigot()
{