OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 15:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

readd chunk pos long optimization

Browse source
This commit is contained in:
Lulu13022002 2024-12-15 16:11:42 +01:00
parent 0895318159
commit 1d6c40afac
No known key found for this signature in database
GPG key ID: 491C8F0B8ACDEB01
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
paper-server/patches/sources/net/minecraft/world/level/BaseCommandBlock.java.patch
View file

@ -17,7 +17,7 @@
} }
}); });
- server.getCommands().performPrefixedCommand(commandSourceStack, this.command); - server.getCommands().performPrefixedCommand(commandSourceStack, this.command);
+ server.getCommands().dispatchServerCommand(commandSourceStack, this.command); // CraftBukkit + server.getCommands().dispatchServerCommand(commandSourceStack, this.command); // CraftBukkit
} catch (Throwable var6) { } catch (Throwable var6) {
CrashReport crashReport = CrashReport.forThrowable(var6, "Executing command block"); CrashReport crashReport = CrashReport.forThrowable(var6, "Executing command block");
CrashReportCategory crashReportCategory = crashReport.addCategory("Command to be executed"); CrashReportCategory crashReportCategory = crashReport.addCategory("Command to be executed");

5
paper-server/patches/sources/net/minecraft/world/level/BaseSpawner.java.patch
View file

@ -86,7 +86,7 @@
+ flag = true; // Paper + flag = true; // Paper
+ // CraftBukkit start + // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) { + if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
+ continue; + continue;
+ } + }
+ if (!serverLevel.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { + if (!serverLevel.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) {
+ // CraftBukkit end + // CraftBukkit end
@ -106,12 +106,11 @@
} }
public void load(@Nullable Level level, BlockPos pos, CompoundTag tag) { public void load(@Nullable Level level, BlockPos pos, CompoundTag tag) {
- this.spawnDelay = tag.getShort("Delay");
+ // Paper start - use larger int if set + // Paper start - use larger int if set
+ if (tag.contains("Paper.Delay")) { + if (tag.contains("Paper.Delay")) {
+ this.spawnDelay = tag.getInt("Paper.Delay"); + this.spawnDelay = tag.getInt("Paper.Delay");
+ } else { + } else {
+ this.spawnDelay = tag.getShort("Delay"); this.spawnDelay = tag.getShort("Delay");
+ } + }
+ // Paper end + // Paper end
boolean flag = tag.contains("SpawnData", 10); boolean flag = tag.contains("SpawnData", 10);

9
paper-server/patches/sources/net/minecraft/world/level/ChunkPos.java.patch
View file

@ -28,3 +28,12 @@
} }
public static ChunkPos minFromRegion(int chunkX, int chunkZ) { public static ChunkPos minFromRegion(int chunkX, int chunkZ) {
@@ -74,7 +_,7 @@
}
public long toLong() {
- return asLong(this.x, this.z);
+ return this.longKey; // Paper
}
public static long asLong(int x, int z) {