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

Fix conflicts to update to latest Bukkit, yay fluff.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-01-20 14:52:20 +11:00
parent 7654578ddc
commit 353ba3e15b
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0019-Add-Custom-Timings-to-various-points.patch
View File

@@ -1,4 +1,4 @@
From ef52fe6ba0830854af641e8e9355fc0a16f94c73 Mon Sep 17 00:00:00 2001
From 2af2697578d73f9965a4578afe80aa49a0cd30ab Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Add Custom Timings to various points
@@ -158,7 +158,7 @@ index 7d2e633..b2481aa 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 80656b2..9cdadf1 100644
index 43a24f5..7ca0acf 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -25,6 +25,7 @@ import org.bukkit.craftbukkit.util.Waitable;
@@ -169,7 +169,7 @@ index 80656b2..9cdadf1 100644
import org.bukkit.event.Event;
import org.bukkit.event.block.Action;
import org.bukkit.event.block.SignChangeEvent;
@@ -67,6 +68,7 @@ public class PlayerConnection extends Connection {
@@ -68,6 +69,7 @@ public class PlayerConnection extends Connection {
private double q;
public boolean checkMovement = true; // CraftBukkit - private -> public
private IntHashMap s = new IntHashMap();
@@ -177,7 +177,7 @@ index 80656b2..9cdadf1 100644
public PlayerConnection(MinecraftServer minecraftserver, INetworkManager inetworkmanager, EntityPlayer entityplayer) {
this.minecraftServer = minecraftserver;
@@ -975,6 +977,7 @@ public class PlayerConnection extends Connection {
@@ -976,6 +978,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit end
private void handleCommand(String s) {
@@ -185,7 +185,7 @@ index 80656b2..9cdadf1 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -982,19 +985,23 @@ public class PlayerConnection extends Connection {
@@ -983,19 +986,23 @@ public class PlayerConnection extends Connection {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -274,7 +274,7 @@ index e28aa00..3c6adb6 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 6e5434b..fdb3fc7 100644
index faa56ac..b7ab326 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -157,9 +157,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate