SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
Spigot
2014-05-14 14:02:09 +01:00
parent d54d6ad87d
commit 51faa817d1
11 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0066-BungeeCord-Support.patch
View File

@@ -1,4 +1,4 @@
From 0e24dd43654d91417b154781cf244225845ae584 Mon Sep 17 00:00:00 2001
From edbcf8d6f20fe171f6ec76291e33c7192110b59b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@@ -156,10 +156,10 @@ index 4c5d77e..cd9a8f5 100644
if (this.j.isBanned(gameprofile) && !this.j.get(gameprofile).e()) { // Should be hasExpired
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6a556cf..92ae2fa 100644
index 73d92fd..4c13657 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -648,7 +648,13 @@ public final class CraftServer implements Server {
@@ -646,7 +646,13 @@ public final class CraftServer implements Server {
}
public long getConnectionThrottle() {