2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2022-09-26 10:02:51 +02:00
|
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
2021-06-11 14:02:28 +02:00
|
|
|
Date: Wed, 3 Jun 2020 11:37:13 -0700
|
|
|
|
Subject: [PATCH] Optimise getType calls
|
|
|
|
|
|
|
|
Remove the map lookup for converting from Block->Bukkit Material
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockState.java b/src/main/java/net/minecraft/world/level/block/state/BlockState.java
|
2022-12-07 21:16:54 +01:00
|
|
|
index da878e180c6b94f98dc82c6e8395f63ecc9b2c1e..a9b0f5950b6f97ea4c2a1075946b92008b62c9d9 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/state/BlockState.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/state/BlockState.java
|
2021-06-14 18:58:00 +02:00
|
|
|
@@ -10,6 +10,17 @@ import net.minecraft.world.level.block.state.properties.Property;
|
|
|
|
public class BlockState extends BlockBehaviour.BlockStateBase {
|
2022-12-07 21:16:54 +01:00
|
|
|
public static final Codec<BlockState> CODEC = codec(BuiltInRegistries.BLOCK.byNameCodec(), Block::defaultBlockState).stable();
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
+ // Paper start - optimise getType calls
|
|
|
|
+ org.bukkit.Material cachedMaterial;
|
|
|
|
+
|
|
|
|
+ public final org.bukkit.Material getBukkitMaterial() {
|
|
|
|
+ if (this.cachedMaterial == null) {
|
|
|
|
+ this.cachedMaterial = org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(this.getBlock());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return this.cachedMaterial;
|
|
|
|
+ }
|
|
|
|
+ // Paper end - optimise getType calls
|
2021-06-14 18:58:00 +02:00
|
|
|
public BlockState(Block block, ImmutableMap<Property<?>, Comparable<?>> propertyMap, MapCodec<BlockState> codec) {
|
|
|
|
super(block, propertyMap, codec);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
|
2022-06-08 08:25:32 +02:00
|
|
|
index 0511ac55c4e6d9736ec12e94c9899eb04d5cd2e3..75193684a71d694736087d1a368b8fb6a8c8363b 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
|
2022-06-08 08:25:32 +02:00
|
|
|
@@ -84,7 +84,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
|
2021-06-11 14:02:28 +02:00
|
|
|
public Material getBlockType(int x, int y, int z) {
|
2021-06-14 18:58:00 +02:00
|
|
|
this.validateChunkCoordinates(x, y, z);
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-06-14 18:58:00 +02:00
|
|
|
- return CraftMagicNumbers.getMaterial(this.blockids[this.getSectionIndex(y)].get(x, y & 0xF, z).getBlock());
|
|
|
|
+ return this.blockids[this.getSectionIndex(y)].get(x, y & 0xF, z).getBukkitMaterial(); // Paper - optimise getType calls
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
2022-12-19 11:46:55 +01:00
|
|
|
index eba015c33dcf63ff85569eb7ee7e6b3def2b05ac..01827f2398cec6e18ab490e664360beed9dbca83 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
2022-12-07 21:16:54 +01:00
|
|
|
@@ -226,7 +226,7 @@ public class CraftBlock implements Block {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public Material getType() {
|
2021-06-14 18:58:00 +02:00
|
|
|
- return CraftMagicNumbers.getMaterial(this.world.getBlockState(position).getBlock());
|
|
|
|
+ return this.world.getBlockState(this.position).getBukkitMaterial(); // Paper - optimise getType calls
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
|
2021-11-24 17:39:04 +01:00
|
|
|
index 0a755f38fae9dc84440f43113920c5b4c6d8218b..7b9e943b391c061782fccd2b8d705ceec8db50fe 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
|
2021-10-15 13:43:19 +02:00
|
|
|
@@ -166,7 +166,7 @@ public class CraftBlockState implements BlockState {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public Material getType() {
|
2021-06-14 18:58:00 +02:00
|
|
|
- return CraftMagicNumbers.getMaterial(this.data.getBlock());
|
|
|
|
+ return this.data.getBukkitMaterial(); // Paper - optimise getType calls
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public void setFlag(int flag) {
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
2022-12-09 12:30:55 +01:00
|
|
|
index 45c90505c778bfdebf0884190a422d12a0673d71..3399e8cdf2230bd71444abb43829c54d7277ce36 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
2022-07-12 19:16:05 +02:00
|
|
|
@@ -50,7 +50,7 @@ public class CraftBlockData implements BlockData {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public Material getMaterial() {
|
2021-06-14 18:58:00 +02:00
|
|
|
- return CraftMagicNumbers.getMaterial(this.state.getBlock());
|
|
|
|
+ return this.state.getBukkitMaterial(); // Paper - optimise getType calls
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public BlockState getState() {
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
|
2021-11-24 17:39:04 +01:00
|
|
|
index ee88ff2ee86bbd3ccf3e4a0b2310f020f137ef4f..5e15feb408b8a05ec5ee393a604c8d39a91ff106 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
|
2021-11-24 17:39:04 +01:00
|
|
|
@@ -96,7 +96,7 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public Material getType(int x, int y, int z) {
|
2021-06-14 18:58:00 +02:00
|
|
|
- return CraftMagicNumbers.getMaterial(this.getTypeId(x, y, z).getBlock());
|
|
|
|
+ return this.getTypeId(x, y, z).getBukkitMaterial(); // Paper - optimise getType calls
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|