mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 20:53:09 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
107 lines
4.5 KiB
Diff
107 lines
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Wed, 15 Aug 2018 12:05:12 -0700
|
|
Subject: [PATCH] Optimize BlockPosition helper methods
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
|
|
index 83e7c141d947f8f8096fed1da716560494bc5c62..8e00fd1a1fb0d73e800395f4b9fffdbdb6c6b5cb 100644
|
|
--- a/src/main/java/net/minecraft/core/BlockPos.java
|
|
+++ b/src/main/java/net/minecraft/core/BlockPos.java
|
|
@@ -157,67 +157,84 @@ public class BlockPos extends Vec3i {
|
|
|
|
@Override
|
|
public BlockPos above() {
|
|
- return this.relative(Direction.UP);
|
|
+ return new BlockPos(this.getX(), this.getY() + 1, this.getZ()); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos above(int distance) {
|
|
- return this.relative(Direction.UP, distance);
|
|
+ return distance == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY() + distance, this.getZ()); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos below() {
|
|
- return this.relative(Direction.DOWN);
|
|
+ return new BlockPos(this.getX(), this.getY() - 1, this.getZ()); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos below(int i) {
|
|
- return this.relative(Direction.DOWN, i);
|
|
+ return i == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY() - i, this.getZ()); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos north() {
|
|
- return this.relative(Direction.NORTH);
|
|
+ return new BlockPos(this.getX(), this.getY(), this.getZ() - 1); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos north(int distance) {
|
|
- return this.relative(Direction.NORTH, distance);
|
|
+ return distance == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY(), this.getZ() - distance); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos south() {
|
|
- return this.relative(Direction.SOUTH);
|
|
+ return new BlockPos(this.getX(), this.getY(), this.getZ() + 1); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos south(int distance) {
|
|
- return this.relative(Direction.SOUTH, distance);
|
|
+ return distance == 0 ? this.immutable() : new BlockPos(this.getX(), this.getY(), this.getZ() + distance); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos west() {
|
|
- return this.relative(Direction.WEST);
|
|
+ return new BlockPos(this.getX() - 1, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos west(int distance) {
|
|
- return this.relative(Direction.WEST, distance);
|
|
+ return distance == 0 ? this.immutable() : new BlockPos(this.getX() - distance, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos east() {
|
|
- return this.relative(Direction.EAST);
|
|
+ return new BlockPos(this.getX() + 1, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos east(int distance) {
|
|
- return this.relative(Direction.EAST, distance);
|
|
+ return distance == 0 ? this.immutable() : new BlockPos(this.getX() + distance, this.getY(), this.getZ()); // Paper - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|
|
public BlockPos relative(Direction direction) {
|
|
+ // Paper start - Perf: Optimize BlockPosition
|
|
+ switch(direction) {
|
|
+ case UP:
|
|
+ return new BlockPos(this.getX(), this.getY() + 1, this.getZ());
|
|
+ case DOWN:
|
|
+ return new BlockPos(this.getX(), this.getY() - 1, this.getZ());
|
|
+ case NORTH:
|
|
+ return new BlockPos(this.getX(), this.getY(), this.getZ() - 1);
|
|
+ case SOUTH:
|
|
+ return new BlockPos(this.getX(), this.getY(), this.getZ() + 1);
|
|
+ case WEST:
|
|
+ return new BlockPos(this.getX() - 1, this.getY(), this.getZ());
|
|
+ case EAST:
|
|
+ return new BlockPos(this.getX() + 1, this.getY(), this.getZ());
|
|
+ default:
|
|
return new BlockPos(this.getX() + direction.getStepX(), this.getY() + direction.getStepY(), this.getZ() + direction.getStepZ());
|
|
+ }
|
|
+ // Paper end - Perf: Optimize BlockPosition
|
|
}
|
|
|
|
@Override
|