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

Update Spigot to Minecraft 1.6.2

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-09 10:31:10 +10:00
parent 0485474219
commit 6fe8638955
25 changed files with 140 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 52574dc6475c15ac44314e9913500b2f8eaa2d02 Mon Sep 17 00:00:00 2001
From 056cb7e59eb35bc88af1e5f39d0035106087d6f6 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 06f85fd..fd62164 100644
index 671384d..e095ae0 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;
@@ -46,7 +46,7 @@ index 06f85fd..fd62164 100644
public Entity(World world) {
this.id = entityCount++;
this.l = 1.0D;
@@ -400,6 +403,7 @@ public abstract class Entity {
@@ -405,6 +408,7 @@ public abstract class Entity {
}
// CraftBukkit end
@@ -54,7 +54,7 @@ index 06f85fd..fd62164 100644
if (this.Z) {
this.boundingBox.d(d0, d1, d2);
this.locX = (this.boundingBox.a + this.boundingBox.d) / 2.0D;
@@ -708,6 +712,7 @@ public abstract class Entity {
@@ -713,6 +717,7 @@ public abstract class Entity {
this.world.methodProfiler.b();
}
@@ -63,7 +63,7 @@ index 06f85fd..fd62164 100644
protected void C() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d8e9e8d..994b260 100644
index 5652710..7b8ea64 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;
@@ -144,10 +144,10 @@ index d8e9e8d..994b260 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 f82d932..e5937fc 100644
index ff685d5..54e96c2 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -968,6 +968,7 @@ public class PlayerConnection extends Connection {
@@ -949,6 +949,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit end
private void handleCommand(String s) {
@@ -155,7 +155,7 @@ index f82d932..e5937fc 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -975,19 +976,23 @@ public class PlayerConnection extends Connection {
@@ -956,19 +957,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 8c4bbf9..75402e7 100644
index d5552b6..9da3f13 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 8c4bbf9..75402e7 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c4248d0..b7e0551 100644
index 1a34feb..db0345d 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