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

Update upstream B/CB

Browse Source
This commit is contained in:
Zach Brown
2016-08-07 00:01:31 -05:00
parent 01a09f8ff1
commit 15f3ca7ecb
12 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0005-Timings-v2.patch
View File

@@ -1,4 +1,4 @@
From 154f0ef603f61f2902d211375f658b61246b350c Mon Sep 17 00:00:00 2001
From 35c7f457c6c2ae182fba3e9889a240de77c1c4c8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@@ -964,10 +964,10 @@ index 0668887..e0f448d 100644
this.methodProfiler.b();
this.U.clear();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1ef30a3..c880d85 100644
index 03169db..a519b71 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1726,6 +1726,7 @@ public final class CraftServer implements Server {
@@ -1722,6 +1722,7 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{
@@ -975,7 +975,7 @@ index 1ef30a3..c880d85 100644
@Override
public YamlConfiguration getConfig()
{
@@ -1733,6 +1734,24 @@ public final class CraftServer implements Server {
@@ -1729,6 +1730,24 @@ public final class CraftServer implements Server {
}
@Override
@@ -1411,5 +1411,5 @@ index 30efc99..eb30abe 100644
}
}
--
2.9.0.windows.1
2.9.2.windows.1