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

Update to CraftBukkit 1.6.4

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-20 11:46:45 +10:00
parent 759d56f0fb
commit d0f0d605bf
26 changed files with 129 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
CraftBukkit-Patches/0017-Improved-Timings-System.patch
View File

@@ -1,4 +1,4 @@
From aedca23e7d617be31e381f058f6bd33ddfaad927 Mon Sep 17 00:00:00 2001
From 85337aff36373256de0d97501f509d6d83642d83 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System
@@ -26,7 +26,7 @@ index b73f69c..17934c0 100644
// CraftBukkit start - If we didn't need to load the chunk run the callback now
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 50edbdb..76d9998 100644
index 2158088..d65c123 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
@@ -61,9 +61,9 @@ index 50edbdb..76d9998 100644
+ org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.stopTiming(); // Spigot
}
protected void C() {
protected void D() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f025083..f52d619 100644
index 830abcd..fba219f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -7,7 +7,6 @@ import java.security.KeyPair;
@@ -82,7 +82,7 @@ index f025083..f52d619 100644
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
import org.bukkit.event.world.WorldSaveEvent;
@@ -409,7 +409,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -411,7 +411,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
lastTick = curTime;
MinecraftServer.currentTick++;
@@ -93,7 +93,7 @@ index f025083..f52d619 100644
}
// Spigot end
} else {
@@ -508,6 +511,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -510,6 +513,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
public void t() {
this.methodProfiler.a("levels");
@@ -101,7 +101,7 @@ index f025083..f52d619 100644
// CraftBukkit start
this.server.getScheduler().mainThreadHeartbeat(this.ticks);
@@ -516,7 +520,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -518,7 +522,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
processQueue.remove().run();
}
@@ -112,7 +112,7 @@ index f025083..f52d619 100644
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
@@ -568,7 +575,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -570,7 +577,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.methodProfiler.b();
this.methodProfiler.a("tracker");
@@ -122,7 +122,7 @@ index f025083..f52d619 100644
this.methodProfiler.b();
this.methodProfiler.b();
// } // CraftBukkit
@@ -577,14 +586,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -579,14 +588,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
this.methodProfiler.c("connection");
@@ -144,10 +144,10 @@ index f025083..f52d619 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6444a2f..4c900a6 100644
index a5d7500..ad65a6a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -939,6 +939,7 @@ public class PlayerConnection extends Connection {
@@ -944,6 +944,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit end
private void handleCommand(String s) {
@@ -155,7 +155,7 @@ index 6444a2f..4c900a6 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -946,19 +947,23 @@ public class PlayerConnection extends Connection {
@@ -951,19 +952,23 @@ public class PlayerConnection extends Connection {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -197,7 +197,7 @@ index f4be980..6ae7cb3 100644
private static Map b = new HashMap();
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d5552b6..9da3f13 100644
index ebbda63..3143d6e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -13,6 +13,7 @@ import java.util.concurrent.Callable;
@@ -299,7 +299,7 @@ index d5552b6..9da3f13 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 1a34feb..db0345d 100644
index bff9c6a..c1239f1 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -179,9 +179,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate