Paper 1.9

This commit is contained in:
Zach Brown
2016-02-29 17:09:49 -06:00
parent cf5b4b8828
commit 26eb457a39
139 changed files with 5550 additions and 8067 deletions

View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 13 Feb 2016 19:28:50 -0600
Date: Thu, 3 Mar 2016 02:07:55 -0600
Subject: [PATCH] Optimize getBlockData
Hot method, so reduce # of instructions for the method.
@@ -10,11 +10,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk {
}
return this.a(i, j, k).c();
}
+ // PaperSpigot start - Optimize getBlockData
public IBlockData getBlockData(final BlockPosition blockposition) {
+ // Paper - Optimize getBlockData
public IBlockData getBlockData(BlockPosition blockposition) {
- return this.a(blockposition.getX(), blockposition.getY(), blockposition.getZ());
+ if (blockposition.getY() >= 0 && blockposition.getY() >> 4 < this.sections.length) {
+ ChunkSection chunksection = this.sections[blockposition.getY() >> 4];
+ if (chunksection != null) {
@@ -22,10 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }
+ }
+ return Blocks.AIR.getBlockData();
+ }
+ public IBlockData getBlockDataSlow(final BlockPosition blockposition) {
+ // PaperSpigot end
if (this.world.G() == WorldType.DEBUG_ALL_BLOCK_STATES) {
IBlockData iblockdata = null;
}
public IBlockData a(final int i, final int j, final int k) {
--