papermc/Spigot-Server-Patches/0060-Optimize-getBlockData.patch

32 lines
1.2 KiB
Diff
Raw Normal View History

2016-06-09 03:57:14 +00:00
From c70068607b6fe555ded74276fc6331e5df296723 Mon Sep 17 00:00:00 2001
2016-02-14 01:29:59 +00:00
From: Aikar <aikar@aikar.co>
2016-02-29 23:09:49 +00:00
Date: Thu, 3 Mar 2016 02:07:55 -0600
2016-02-14 01:29:59 +00:00
Subject: [PATCH] Optimize getBlockData
Hot method, so reduce # of instructions for the method.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
2016-06-09 03:57:14 +00:00
index 770da2b..9b0b98b 100644
2016-02-14 01:29:59 +00:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -395,8 +395,15 @@ public class Chunk {
2016-02-29 23:09:49 +00:00
return this.a(i, j, k).c();
2016-02-14 01:29:59 +00:00
}
2016-02-29 23:09:49 +00:00
+ // Paper - Optimize getBlockData
public IBlockData getBlockData(BlockPosition blockposition) {
- return this.a(blockposition.getX(), blockposition.getY(), blockposition.getZ());
2016-02-14 01:29:59 +00:00
+ if (blockposition.getY() >= 0 && blockposition.getY() >> 4 < this.sections.length) {
+ ChunkSection chunksection = this.sections[blockposition.getY() >> 4];
+ if (chunksection != null) {
+ return chunksection.getType(blockposition.getX() & 15, blockposition.getY() & 15, blockposition.getZ() & 15);
+ }
+ }
+ return Blocks.AIR.getBlockData();
2016-02-29 23:09:49 +00:00
}
2016-02-14 01:29:59 +00:00
2016-02-29 23:09:49 +00:00
public IBlockData a(final int i, final int j, final int k) {
2016-02-14 01:29:59 +00:00
--
2016-06-09 03:57:14 +00:00
2.8.3
2016-02-14 01:29:59 +00:00