mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
update yarn param mappings (#8563)
This commit is contained in:
parent
97cb10205d
commit
f93eb6e135
10 changed files with 24 additions and 24 deletions
|
@ -61,7 +61,7 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
paramMappings("net.fabricmc:yarn:1.19.2+build.1:mergedv2")
|
paramMappings("net.fabricmc:yarn:1.19.2+build.28:mergedv2")
|
||||||
remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
|
remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
|
||||||
decompiler("net.minecraftforge:forgeflower:1.5.605.7")
|
decompiler("net.minecraftforge:forgeflower:1.5.605.7")
|
||||||
spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
|
spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6")
|
||||||
|
|
|
@ -270,7 +270,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!playerchatmessage.verify(chatsender)) {
|
if (!message.verify(chatsender)) {
|
||||||
- this.disconnect(Component.translatable("multiplayer.disconnect.unsigned_chat"));
|
- this.disconnect(Component.translatable("multiplayer.disconnect.unsigned_chat"));
|
||||||
+ this.disconnect(Component.translatable("multiplayer.disconnect.unsigned_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.UNSIGNED_CHAT); // Paper - kick event cause
|
+ this.disconnect(Component.translatable("multiplayer.disconnect.unsigned_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.UNSIGNED_CHAT); // Paper - kick event cause
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -184,8 +184,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
|
@@ -0,0 +0,0 @@ public class RegionFile implements AutoCloseable {
|
||||||
((java.nio.Buffer) bytebuffer).position(5); // CraftBukkit - decompile error
|
((java.nio.Buffer) buf).position(5); // CraftBukkit - decompile error
|
||||||
filechannel.write(bytebuffer);
|
filechannel.write(buf);
|
||||||
} catch (Throwable throwable) {
|
} catch (Throwable throwable) {
|
||||||
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(throwable); // Paper
|
+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(throwable); // Paper
|
||||||
if (filechannel != null) {
|
if (filechannel != null) {
|
||||||
|
|
|
@ -21,9 +21,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
@@ -0,0 +0,0 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playerchatmessage.hasExpiredServer(Instant.now())) {
|
if (message.hasExpiredServer(Instant.now())) {
|
||||||
- ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized?", this.player.getName().getString(), playerchatmessage.signedContent().plain());
|
- ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized?", this.player.getName().getString(), message.signedContent().plain());
|
||||||
+ ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized? c: {} s: {}", this.player.getName().getString(), playerchatmessage.signedContent().plain(), playerchatmessage.timeStamp().getEpochSecond(), Instant.now().getEpochSecond()); // Paper
|
+ ServerGamePacketListenerImpl.LOGGER.warn("{} sent expired chat: '{}'. Is the client/server system time unsynchronized? c: {} s: {}", this.player.getName().getString(), message.signedContent().plain(), message.timeStamp().getEpochSecond(), Instant.now().getEpochSecond()); // Paper
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -760,7 +760,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
|
|
||||||
public class RegionFileVersion {
|
public class RegionFileVersion {
|
||||||
- private static final Int2ObjectMap<RegionFileVersion> VERSIONS = new Int2ObjectOpenHashMap<>();
|
- private static final Int2ObjectMap<RegionFileVersion> VERSIONS = new Int2ObjectOpenHashMap<>();
|
||||||
+ public static final Int2ObjectMap<RegionFileVersion> VERSIONS = new Int2ObjectOpenHashMap<>(); // Paper - public
|
+ public static final Int2ObjectMap<RegionFileVersion> VERSIONS = new Int2ObjectOpenHashMap<>(); // Paper - private -> public
|
||||||
public static final RegionFileVersion VERSION_GZIP = register(new RegionFileVersion(1, (inputStream) -> {
|
public static final RegionFileVersion VERSION_GZIP = register(new RegionFileVersion(1, (stream) -> {
|
||||||
return new FastBufferedInputStream(new GZIPInputStream(inputStream));
|
return new FastBufferedInputStream(new GZIPInputStream(stream));
|
||||||
}, (outputStream) -> {
|
}, (stream) -> {
|
||||||
|
|
|
@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ this(idList, indexBits, listener, CrudeIncrementalIntIdentityHashBiMap.create((1 << indexBits) + 1)); // Paper - Avoid unnecessary resize operation in CrudeIncrementalIntIdentityHashBiMap
|
+ this(idList, indexBits, listener, CrudeIncrementalIntIdentityHashBiMap.create((1 << indexBits) + 1)); // Paper - Avoid unnecessary resize operation in CrudeIncrementalIntIdentityHashBiMap
|
||||||
}
|
}
|
||||||
|
|
||||||
private HashMapPalette(IdMap<T> idMap, int i, PaletteResize<T> paletteResize, CrudeIncrementalIntIdentityHashBiMap<T> crudeIncrementalIntIdentityHashBiMap) {
|
private HashMapPalette(IdMap<T> idList, int indexBits, PaletteResize<T> listener, CrudeIncrementalIntIdentityHashBiMap<T> map) {
|
||||||
@@ -0,0 +0,0 @@ public class HashMapPalette<T> implements Palette<T> {
|
@@ -0,0 +0,0 @@ public class HashMapPalette<T> implements Palette<T> {
|
||||||
public int idFor(T object) {
|
public int idFor(T object) {
|
||||||
int i = this.values.getId(object);
|
int i = this.values.getId(object);
|
||||||
|
|
|
@ -34,10 +34,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
@@ -0,0 +0,0 @@ public class GossipContainer {
|
@@ -0,0 +0,0 @@ public class GossipContainer {
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T> Dynamic<T> store(DynamicOps<T> dynamicOps) {
|
public <T> Dynamic<T> store(DynamicOps<T> ops) {
|
||||||
- return new Dynamic<>(dynamicOps, dynamicOps.createList(this.unpack().map((gossipEntry) -> {
|
- return new Dynamic<>(ops, ops.createList(this.unpack().map((entry) -> {
|
||||||
+ return new Dynamic<>(dynamicOps, dynamicOps.createList(this.decompress().stream().map((gossipEntry) -> {
|
+ return new Dynamic<>(ops, ops.createList(this.decompress().stream().map((entry) -> { // Paper - remove streams from reputation
|
||||||
return gossipEntry.store(dynamicOps);
|
return entry.store(ops);
|
||||||
}).map(Dynamic::getValue)));
|
}).map(Dynamic::getValue)));
|
||||||
}
|
}
|
||||||
@@ -0,0 +0,0 @@ public class GossipContainer {
|
@@ -0,0 +0,0 @@ public class GossipContainer {
|
||||||
|
@ -65,7 +65,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ list.add(new GossipContainer.GossipEntry(uuid, entry.getKey(), entry.getIntValue()));
|
+ list.add(new GossipContainer.GossipEntry(uuid, entry.getKey(), entry.getIntValue()));
|
||||||
+ }
|
+ }
|
||||||
+ return list;
|
+ return list;
|
||||||
+ // Paper - end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
|
|
||||||
public Stream<GossipContainer.GossipEntry> unpack(UUID target) {
|
public Stream<GossipContainer.GossipEntry> unpack(UUID target) {
|
||||||
|
|
|
@ -17132,7 +17132,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ synchronized (this.persistentDataLock) { // Paper - async chunk loading
|
+ synchronized (this.persistentDataLock) { // Paper - async chunk loading
|
||||||
persistentstructurelegacy = this.legacyStructureHandler;
|
persistentstructurelegacy = this.legacyStructureHandler;
|
||||||
if (persistentstructurelegacy == null) {
|
if (persistentstructurelegacy == null) {
|
||||||
this.legacyStructureHandler = persistentstructurelegacy = LegacyStructureDataHandler.getLegacyStructureHandler(resourcekey, (DimensionDataStorage) supplier.get());
|
this.legacyStructureHandler = persistentstructurelegacy = LegacyStructureDataHandler.getLegacyStructureHandler(worldKey, (DimensionDataStorage) stateManagerGetter.get());
|
||||||
@@ -0,0 +0,0 @@ public class ChunkStorage implements AutoCloseable {
|
@@ -0,0 +0,0 @@ public class ChunkStorage implements AutoCloseable {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4932,7 +4932,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
--- a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
|
--- a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
|
||||||
+++ b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
|
+++ b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
|
||||||
@@ -0,0 +0,0 @@ public class EmptyLevelChunk extends LevelChunk {
|
@@ -0,0 +0,0 @@ public class EmptyLevelChunk extends LevelChunk {
|
||||||
this.biome = holder;
|
this.biome = biomeEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ // Paper start - starlight
|
+ // Paper start - starlight
|
||||||
|
|
|
@ -392,12 +392,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
@@ -0,0 +0,0 @@ public final class NaturalSpawner {
|
@@ -0,0 +0,0 @@ public final class NaturalSpawner {
|
||||||
private NaturalSpawner() {}
|
private NaturalSpawner() {}
|
||||||
|
|
||||||
public static NaturalSpawner.SpawnState createState(int spawningChunkCount, Iterable<Entity> entities, NaturalSpawner.ChunkGetter chunkSource, LocalMobCapCalculator localmobcapcalculator) {
|
public static NaturalSpawner.SpawnState createState(int spawningChunkCount, Iterable<Entity> entities, NaturalSpawner.ChunkGetter chunkSource, LocalMobCapCalculator densityCapper) {
|
||||||
+ // Paper start - add countMobs parameter
|
+ // Paper start - add countMobs parameter
|
||||||
+ return createState(spawningChunkCount, entities, chunkSource, localmobcapcalculator, false);
|
+ return createState(spawningChunkCount, entities, chunkSource, densityCapper, false);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public static NaturalSpawner.SpawnState createState(int spawningChunkCount, Iterable<Entity> entities, NaturalSpawner.ChunkGetter chunkSource, LocalMobCapCalculator localmobcapcalculator, boolean countMobs) {
|
+ public static NaturalSpawner.SpawnState createState(int spawningChunkCount, Iterable<Entity> entities, NaturalSpawner.ChunkGetter chunkSource, LocalMobCapCalculator densityCapper, boolean countMobs) {
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
PotentialCalculator spawnercreatureprobabilities = new PotentialCalculator();
|
PotentialCalculator spawnercreatureprobabilities = new PotentialCalculator();
|
||||||
Object2IntOpenHashMap<MobCategory> object2intopenhashmap = new Object2IntOpenHashMap();
|
Object2IntOpenHashMap<MobCategory> object2intopenhashmap = new Object2IntOpenHashMap();
|
||||||
|
@ -407,8 +407,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
}
|
}
|
||||||
|
|
||||||
- if (entity instanceof Mob) {
|
- if (entity instanceof Mob) {
|
||||||
+ if (localmobcapcalculator != null && entity instanceof Mob) { // Paper
|
+ if (densityCapper != null && entity instanceof Mob) { // Paper
|
||||||
localmobcapcalculator.addMob(chunk.getPos(), enumcreaturetype);
|
densityCapper.addMob(chunk.getPos(), enumcreaturetype);
|
||||||
}
|
}
|
||||||
|
|
||||||
object2intopenhashmap.addTo(enumcreaturetype, 1);
|
object2intopenhashmap.addTo(enumcreaturetype, 1);
|
||||||
|
|
Loading…
Reference in a new issue