mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 00:30:25 +01:00
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
From 588da1da60dac3624336295f970c26987135e8f6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Fri, 28 Sep 2018 22:27:33 -0400
|
||
|
|
Subject: [PATCH] Don't recheck type after setting a block
|
||
|
|
|
||
|
|
The server does a "Did my update succeed" check after setting
|
||
|
|
a blocks data to a chunk.
|
||
|
|
|
||
|
|
However, writes can not fail outside of a hard error or a
|
||
|
|
a race condition from multiple threads writing, which is
|
||
|
|
not something that should ever occur on the server.
|
||
|
|
|
||
|
|
So this check is pointless, as if it did occur, the server would
|
||
|
|
be having data corruption issues anyways.
|
||
|
|
|
||
|
|
This provides a small boost to all setType calls.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||
|
|
index e4bda70bb9..895eb60854 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||
|
|
@@ -573,7 +573,7 @@ public class Chunk implements IChunkAccess {
|
||
|
|
this.world.n(blockposition);
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (chunksection.getType(i, j & 15, k).getBlock() != block) {
|
||
|
|
+ if (false && chunksection.getType(i, j & 15, k).getBlock() != block) { // Paper - don't need to recheck this - this would only fail due to non main thread writes which are not supported
|
||
|
|
return null;
|
||
|
|
} else {
|
||
|
|
if (flag1) {
|
||
|
|
--
|
||
|
|
2.19.0
|
||
|
|
|