Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 13:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix compile

Browse Source
This commit is contained in:
Nassim Jahnke 2021-06-13 14:54:37 +02:00
parent 7ff9e98d2a
commit dfe0ef7ab1
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
patches/server/Chunk-debug-command.patch
View File

@ -341,10 +341,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ // sorting by coordinate makes the log easier to read + // sorting by coordinate makes the log easier to read
+ allChunks.sort((ChunkHolder v1, ChunkHolder v2) -> { + allChunks.sort((ChunkHolder v1, ChunkHolder v2) -> {
+ if (v1.location.x != v2.location.x) { + if (v1.pos.x != v2.pos.x) {
+ return Integer.compare(v1.location.x, v2.location.x); + return Integer.compare(v1.pos.x, v2.pos.x);
+ } + }
+ return Integer.compare(v1.location.z, v2.location.z); + return Integer.compare(v1.pos.z, v2.pos.z);
+ }); + });
+ +
+ worldData.addProperty("name", world.getWorld().getName()); + worldData.addProperty("name", world.getWorld().getName());
@ -376,14 +376,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ for (ChunkHolder playerChunk : allChunks) { + for (ChunkHolder playerChunk : allChunks) {
+ JsonObject chunkData = new JsonObject(); + JsonObject chunkData = new JsonObject();
+ +
+ Set<Ticket<?>> tickets = chunkMapDistance.tickets.get(playerChunk.pos.pair()); + Set<Ticket<?>> tickets = chunkMapDistance.tickets.get(playerChunk.pos.longKey);
+ ChunkStatus status = getChunkStatus(playerChunk); + ChunkStatus status = getChunkStatus(playerChunk);
+ +
+ chunkData.addProperty("x", playerChunk.location.x); + chunkData.addProperty("x", playerChunk.pos.x);
+ chunkData.addProperty("z", playerChunk.location.z); + chunkData.addProperty("z", playerChunk.pos.z);
+ chunkData.addProperty("ticket-level", playerChunk.getTicketLevel()); + chunkData.addProperty("ticket-level", playerChunk.getTicketLevel());
+ chunkData.addProperty("state", ChunkHolder.getFullChunkStatus(playerChunk.getTicketLevel()).toString()); + chunkData.addProperty("state", ChunkHolder.getFullChunkStatus(playerChunk.getTicketLevel()).toString());
+ chunkData.addProperty("queued-for-unload", chunkMap.toDrop.contains(playerChunk.pos.pair())); + chunkData.addProperty("queued-for-unload", chunkMap.toDrop.contains(playerChunk.pos.longKey));
+ chunkData.addProperty("status", status == null ? "unloaded" : status.toString()); + chunkData.addProperty("status", status == null ? "unloaded" : status.toString());
+ +
+ JsonArray ticketsData = new JsonArray(); + JsonArray ticketsData = new JsonArray();
@ -428,6 +428,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public static int getTicketLevelFor(net.minecraft.world.level.chunk.ChunkStatus status) { public static int getTicketLevelFor(net.minecraft.world.level.chunk.ChunkStatus status) {
return net.minecraft.server.level.ChunkMap.MAX_VIEW_DISTANCE + net.minecraft.world.level.chunk.ChunkStatus.getDistance(status); return net.minecraft.server.level.ChunkMap.MAX_VIEW_DISTANCE + net.minecraft.world.level.chunk.ChunkStatus.getDistance(status);
} }
diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
+++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
@@ -0,0 +0,0 @@ public class ChunkHolder {
public int oldTicketLevel;
private int ticketLevel;
private int queueLevel;
- final ChunkPos pos;
+ public final ChunkPos pos; // Paper - package->public
private boolean hasChangedSections;
private final ShortSet[] changedBlocksPerSection;
private final BitSet blockChangedLightSectionFilter;
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
@ -454,6 +467,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private final DistanceManager distanceManager; private final DistanceManager distanceManager;
public final ChunkGenerator generator; public final ChunkGenerator generator;
final ServerLevel level; final ServerLevel level;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -0,0 +0,0 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
public static final BlockPos END_SPAWN_POINT = new BlockPos(100, 50, 0);
private static final Logger LOGGER = LogManager.getLogger();
private static final int EMPTY_TIME_NO_TICK = 300;
- final List<ServerPlayer> players;
+ public final List<ServerPlayer> players; // Paper - package->public
public final ServerChunkCache chunkSource; // Paper - public
private final MinecraftServer server;
public final PrimaryLevelData serverLevelData; // CraftBukkit - type
diff --git a/src/main/java/net/minecraft/server/level/Ticket.java b/src/main/java/net/minecraft/server/level/Ticket.java diff --git a/src/main/java/net/minecraft/server/level/Ticket.java b/src/main/java/net/minecraft/server/level/Ticket.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/level/Ticket.java --- a/src/main/java/net/minecraft/server/level/Ticket.java
@ -469,11 +495,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
protected Ticket(TicketType<T> type, int level, T argument) { protected Ticket(TicketType<T> type, int level, T argument) {
this.type = type; this.type = type;
@@ -0,0 +0,0 @@ public final class Ticket<T> implements Comparable<Ticket<?>> {
return this.type;
}
+ public final int getTicketLevel() { return this.getTicketLevel(); } // Paper - OBFHELPER
public int getTicketLevel() {
return this.ticketLevel;
}

17
patches/server/Implement-CraftBlockSoundGroup.patch
View File

@ -48,23 +48,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return CraftSound.getBukkit(soundEffectType.getFallSound()); + return CraftSound.getBukkit(soundEffectType.getFallSound());
+ } + }
+} +}
diff --git a/src/main/java/net/minecraft/world/level/block/SoundType.java b/src/main/java/net/minecraft/world/level/block/SoundType.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/block/SoundType.java
+++ b/src/main/java/net/minecraft/world/level/block/SoundType.java
@@ -0,0 +0,0 @@ public class SoundType {
public static final SoundType POLISHED_DEEPSLATE = new SoundType(1.0F, 1.0F, SoundEvents.POLISHED_DEEPSLATE_BREAK, SoundEvents.POLISHED_DEEPSLATE_STEP, SoundEvents.POLISHED_DEEPSLATE_PLACE, SoundEvents.POLISHED_DEEPSLATE_HIT, SoundEvents.POLISHED_DEEPSLATE_FALL);
public final float volume;
public final float pitch;
- public final SoundEvent breakSound;
+ public final SoundEvent breakSound; public final SoundEvent getBreakSound() { return this.breakSound; } // Paper - OBFHELPER // PAIL private -> public, rename breakSound
private final SoundEvent stepSound;
private final SoundEvent placeSound;
- public final SoundEvent hitSound;
+ public final SoundEvent hitSound; public final SoundEvent getHitSound() { return this.hitSound; } // Paper - OBFHELPER // PAIL private -> public, rename hitSound
private final SoundEvent fallSound;
public SoundType(float volume, float pitch, SoundEvent breakSound, SoundEvent stepSound, SoundEvent placeSound, SoundEvent hitSound, SoundEvent fallSound) {
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java