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

Update to 1.5.1

Browse Source 
By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
This commit is contained in:
Spigot
2013-03-20 21:54:12 +00:00
parent 9a3a09e79b
commit f370ab8784
46 changed files with 153 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From bf102bce710e53f82e2d43cef32df65bb5887bd7 Mon Sep 17 00:00:00 2001
From 880ea9bc4fc136931a5a93eff3e88291503cef3f 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
@@ -39,7 +39,7 @@ index d5887a9..3772ad8 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 0dc65e6..c68e9cf 100644
index fabe3ab..ccc4858 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;
@@ -76,10 +76,10 @@ index 0dc65e6..c68e9cf 100644
protected void C() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 27b2ce2..103ab2c 100644
index 15fbf69..350560e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -512,6 +512,7 @@ public abstract class EntityLiving extends Entity {
@@ -513,6 +513,7 @@ public abstract class EntityLiving extends Entity {
}
public void l_() {
@@ -87,7 +87,7 @@ index 27b2ce2..103ab2c 100644
super.l_();
if (!this.world.isStatic) {
int i;
@@ -538,7 +539,9 @@ public abstract class EntityLiving extends Entity {
@@ -539,7 +540,9 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -97,7 +97,7 @@ index 27b2ce2..103ab2c 100644
double d0 = this.locX - this.lastX;
double d1 = this.locZ - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -629,6 +632,7 @@ public abstract class EntityLiving extends Entity {
@@ -630,6 +633,7 @@ public abstract class EntityLiving extends Entity {
this.world.methodProfiler.b();
this.aE += f2;
@@ -105,7 +105,7 @@ index 27b2ce2..103ab2c 100644
}
// CraftBukkit start - delegate so we can handle providing a reason for health being regained
@@ -1264,6 +1268,7 @@ public abstract class EntityLiving extends Entity {
@@ -1265,6 +1269,7 @@ public abstract class EntityLiving extends Entity {
}
public void c() {
@@ -113,7 +113,7 @@ index 27b2ce2..103ab2c 100644
if (this.bX > 0) {
--this.bX;
}
@@ -1315,6 +1320,7 @@ public abstract class EntityLiving extends Entity {
@@ -1316,6 +1321,7 @@ public abstract class EntityLiving extends Entity {
this.aA = this.yaw;
}
}
@@ -121,7 +121,7 @@ index 27b2ce2..103ab2c 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("jump");
@@ -1333,6 +1339,7 @@ public abstract class EntityLiving extends Entity {
@@ -1334,6 +1340,7 @@ public abstract class EntityLiving extends Entity {
this.world.methodProfiler.b();
this.world.methodProfiler.a("travel");
@@ -129,7 +129,7 @@ index 27b2ce2..103ab2c 100644
this.bD *= 0.98F;
this.bE *= 0.98F;
this.bF *= 0.9F;
@@ -1341,11 +1348,14 @@ public abstract class EntityLiving extends Entity {
@@ -1342,11 +1349,14 @@ public abstract class EntityLiving extends Entity {
this.aO *= this.bE();
this.e(this.bD, this.bE);
this.aO = f;
@@ -145,7 +145,7 @@ index 27b2ce2..103ab2c 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("looting");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d363643..bbad047 100644
index 43b5d96..28135f4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -6,7 +6,6 @@ import java.security.KeyPair;
@@ -279,7 +279,7 @@ index db3fc42..174546d 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 53627a8..4db8a5b 100644
index 9b4cc07..b5c5e36 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;
@@ -566,5 +566,5 @@ index 55db3ff..df134e3 100644
long getPeriod() {
--
1.8.1-rc2
1.8.2