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

Update netty & kindof hacky fix for anvil mishaps

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-12 13:57:00 +10:00
parent f245fd96f8
commit b4464fc721
7 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From eac5b5044c9871541b4503fa158232f5c4a020e5 Mon Sep 17 00:00:00 2001
From 867a1f6e0321859d2573cdfa83b46376396981b9 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 8b280ab..31e3fce 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 8e743ec..8feb1d3 100644
index 1044e4d..171e7e0 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;
@@ -37,7 +37,7 @@ index 8e743ec..8feb1d3 100644
import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.painting.PaintingBreakByEntityEvent;
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
@@ -111,6 +112,8 @@ public abstract class Entity {
@@ -110,6 +111,8 @@ public abstract class Entity {
public EnumEntitySize at;
public boolean valid = false; // CraftBukkit
@@ -46,7 +46,7 @@ index 8e743ec..8feb1d3 100644
public Entity(World world) {
this.id = entityCount++;
this.l = 1.0D;
@@ -431,6 +434,7 @@ public abstract class Entity {
@@ -418,6 +421,7 @@ public abstract class Entity {
public void move(double d0, double d1, double d2) {
if (d0 == 0 && d1 == 0 && d2 == 0) { return; } // Spigot
@@ -54,7 +54,7 @@ index 8e743ec..8feb1d3 100644
if (this.Z) {
this.boundingBox.d(d0, d1, d2);
this.locX = (this.boundingBox.a + this.boundingBox.d) / 2.0D;
@@ -730,6 +734,7 @@ public abstract class Entity {
@@ -717,6 +721,7 @@ public abstract class Entity {
this.world.methodProfiler.b();
}
@@ -63,10 +63,10 @@ index 8e743ec..8feb1d3 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 9210d96..14854ac 100644
index 21819ee..787db39 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -513,6 +513,7 @@ public abstract class EntityLiving extends Entity {
@@ -497,6 +497,7 @@ public abstract class EntityLiving extends Entity {
}
public void l_() {
@@ -74,7 +74,7 @@ index 9210d96..14854ac 100644
super.l_();
if (!this.world.isStatic) {
int i;
@@ -539,7 +540,9 @@ public abstract class EntityLiving extends Entity {
@@ -523,7 +524,9 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -84,7 +84,7 @@ index 9210d96..14854ac 100644
double d0 = this.locX - this.lastX;
double d1 = this.locZ - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -630,6 +633,7 @@ public abstract class EntityLiving extends Entity {
@@ -614,6 +617,7 @@ public abstract class EntityLiving extends Entity {
this.world.methodProfiler.b();
this.aE += f2;
@@ -92,7 +92,7 @@ index 9210d96..14854ac 100644
}
// CraftBukkit start - Delegate so we can handle providing a reason for health being regained
@@ -1267,6 +1271,7 @@ public abstract class EntityLiving extends Entity {
@@ -1252,6 +1256,7 @@ public abstract class EntityLiving extends Entity {
}
public void c() {
@@ -100,7 +100,7 @@ index 9210d96..14854ac 100644
if (this.bX > 0) {
--this.bX;
}
@@ -1318,6 +1323,7 @@ public abstract class EntityLiving extends Entity {
@@ -1303,6 +1308,7 @@ public abstract class EntityLiving extends Entity {
this.aA = this.yaw;
}
}
@@ -108,7 +108,7 @@ index 9210d96..14854ac 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("jump");
@@ -1336,6 +1342,7 @@ public abstract class EntityLiving extends Entity {
@@ -1321,6 +1327,7 @@ public abstract class EntityLiving extends Entity {
this.world.methodProfiler.b();
this.world.methodProfiler.a("travel");
@@ -116,7 +116,7 @@ index 9210d96..14854ac 100644
this.bD *= 0.98F;
this.bE *= 0.98F;
this.bF *= 0.9F;
@@ -1344,11 +1351,14 @@ public abstract class EntityLiving extends Entity {
@@ -1329,11 +1336,14 @@ public abstract class EntityLiving extends Entity {
this.aO *= this.bE();
this.e(this.bD, this.bE);
this.aO = f;