Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes: 933e9094 #664: Add methods to get/set ItemStacks in EquipmentSlots 18722312 #662: Expose ItemStack and hand used in PlayerShearEntityEvent
55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 5 Apr 2016 21:38:58 -0400
|
|
Subject: [PATCH] Remove Debug checks from DataBits
|
|
|
|
These are super hot and causing noticeable hits
|
|
|
|
Before: http://i.imgur.com/nQsMzAE.png
|
|
After: http://i.imgur.com/nJ46crB.png
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
|
|
index 2edd9b87146a3d1b6623b0efb17b28b524f18c2f..f9680b6830c77f31e1eb8b6845dd6d58d04f624a 100644
|
|
--- a/src/main/java/net/minecraft/server/DataBits.java
|
|
+++ b/src/main/java/net/minecraft/server/DataBits.java
|
|
@@ -15,7 +15,7 @@ public class DataBits {
|
|
}
|
|
|
|
public DataBits(int i, int j, long[] along) {
|
|
- Validate.inclusiveBetween(1L, 32L, (long) i);
|
|
+ //Validate.inclusiveBetween(1L, 32L, (long) i); // Paper
|
|
this.d = j;
|
|
this.b = i;
|
|
this.a = along;
|
|
@@ -28,8 +28,8 @@ public class DataBits {
|
|
}
|
|
|
|
public int a(int i, int j) {
|
|
- Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i);
|
|
- Validate.inclusiveBetween(0L, this.c, (long) j);
|
|
+ //Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); // Paper
|
|
+ //Validate.inclusiveBetween(0L, this.c, (long) j); // Paper
|
|
int k = i * this.b;
|
|
int l = k >> 6;
|
|
int i1 = (i + 1) * this.b - 1 >> 6;
|
|
@@ -50,8 +50,8 @@ public class DataBits {
|
|
}
|
|
|
|
public void b(int i, int j) {
|
|
- Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i);
|
|
- Validate.inclusiveBetween(0L, this.c, (long) j);
|
|
+ //Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); // Paper
|
|
+ //Validate.inclusiveBetween(0L, this.c, (long) j); // Paper
|
|
int k = i * this.b;
|
|
int l = k >> 6;
|
|
int i1 = (i + 1) * this.b - 1 >> 6;
|
|
@@ -68,7 +68,7 @@ public class DataBits {
|
|
}
|
|
|
|
public int a(int i) {
|
|
- Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i);
|
|
+ //Validate.inclusiveBetween(0L, (long) (this.d - 1), (long) i); // Paper
|
|
int j = i * this.b;
|
|
int k = j >> 6;
|
|
int l = (i + 1) * this.b - 1 >> 6;
|