core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't box / rebox on object addition

This commit is contained in:
md_5 2013-12-14 19:50:33 +11:00
parent 0e03c0defe
commit 37eb6b4024
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0073-Optimize-DataWatcher.patch
View File

@ -1,4 +1,4 @@
From 6a093e7e3993c3c1aa92c2fcc1b33ccf19638993 Mon Sep 17 00:00:00 2001 From 18db29b0ceb2bc7ed96c080d0debffb12b9aaf0e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:45:47 +1100 Date: Fri, 13 Dec 2013 11:45:47 +1100
Subject: [PATCH] Optimize DataWatcher Subject: [PATCH] Optimize DataWatcher
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize DataWatcher
Use primitive orientated collections, as well as more effective copies across collections. Use primitive orientated collections, as well as more effective copies across collections.
diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
index 90a2a80..adc1bb2 100644 index 90a2a80..cca6bd9 100644
--- a/src/main/java/net/minecraft/server/DataWatcher.java --- a/src/main/java/net/minecraft/server/DataWatcher.java
+++ b/src/main/java/net/minecraft/server/DataWatcher.java +++ b/src/main/java/net/minecraft/server/DataWatcher.java
@@ -14,8 +14,13 @@ public class DataWatcher { @@ -14,8 +14,13 @@ public class DataWatcher {
@ -30,9 +30,10 @@ index 90a2a80..adc1bb2 100644
public void a(int i, Object object) { public void a(int i, Object object) {
- Integer integer = (Integer) c.get(object.getClass()); - Integer integer = (Integer) c.get(object.getClass());
+ Integer integer = (Integer) classToId.get(object.getClass()); // Spigot + int integer = classToId.get(object.getClass()); // Spigot
if (integer == null) { - if (integer == null) {
+ if (integer == -1) { // Spigot
throw new IllegalArgumentException("Unknown data type: " + object.getClass()); throw new IllegalArgumentException("Unknown data type: " + object.getClass());
} else if (i > 31) { } else if (i > 31) {
throw new IllegalArgumentException("Data value id is too big with " + i + "! (Max is " + 31 + ")"); throw new IllegalArgumentException("Data value id is too big with " + i + "! (Max is " + 31 + ")");
@ -40,7 +41,8 @@ index 90a2a80..adc1bb2 100644
+ } else if (this.dataValues.containsKey(i)) { // Spigot + } else if (this.dataValues.containsKey(i)) { // Spigot
throw new IllegalArgumentException("Duplicate id value for " + i + "!"); throw new IllegalArgumentException("Duplicate id value for " + i + "!");
} else { } else {
WatchableObject watchableobject = new WatchableObject(integer.intValue(), i, object); - WatchableObject watchableobject = new WatchableObject(integer.intValue(), i, object);
+ WatchableObject watchableobject = new WatchableObject(integer, i, object); // Spigot
this.f.writeLock().lock(); this.f.writeLock().lock();
- this.d.put(Integer.valueOf(i), watchableobject); - this.d.put(Integer.valueOf(i), watchableobject);