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

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-18 17:08:19 +00:00
parent 1f1443ed34
commit 804a818172
17 changed files with 84 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 4214005ab5b491ac0a9f6e2994cf1f5f89b01099 Mon Sep 17 00:00:00 2001
From 4d0dee30d2d4d05d385ba1c8742948f79b5a3895 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,18 +26,18 @@ index 1b22934..b669d05 100644
return chunk;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9d933cb..491ef6b 100644
index 1d0dee0..d817369 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;
@@ -15,6 +15,7 @@ import org.bukkit.entity.Hanging;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Painting;
import org.bukkit.entity.Vehicle;
+import org.spigotmc.CustomTimingsHandler; // Spigot
import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import org.bukkit.event.painting.PaintingBreakByEntityEvent;
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
@@ -112,6 +113,8 @@ public abstract class Entity {
@@ -114,6 +115,8 @@ public abstract class Entity {
public boolean valid; // CraftBukkit
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
@@ -46,7 +46,7 @@ index 9d933cb..491ef6b 100644
public int getId() {
return this.id;
}
@@ -424,7 +427,8 @@ public abstract class Entity {
@@ -426,7 +429,8 @@ public abstract class Entity {
if (d0 == 0 && d1 == 0 && d2 == 0 && this.vehicle == null && this.passenger == null) {
return;
}
@@ -56,7 +56,7 @@ index 9d933cb..491ef6b 100644
if (this.X) {
this.boundingBox.d(d0, d1, d2);
this.locX = (this.boundingBox.a + this.boundingBox.d) / 2.0D;
@@ -733,6 +737,7 @@ public abstract class Entity {
@@ -735,6 +739,7 @@ public abstract class Entity {
this.world.methodProfiler.b();
}
@@ -65,7 +65,7 @@ index 9d933cb..491ef6b 100644
protected String G() {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index dda2602..d7b93a3 100644
index 17b15f6..21cf068 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -37,6 +37,7 @@ import jline.console.ConsoleReader;
@@ -139,7 +139,7 @@ index dda2602..d7b93a3 100644
public boolean getAllowNether() {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 946681d..f34fd03 100644
index 9fa307e..ab9dc66 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -938,6 +938,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -539,5 +539,5 @@ index 55db3ff..7d294c0 100644
}
--
1.8.3.2
1.9.1