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

AT & Mapping fixes (#6809)

Browse source
This commit is contained in:
Jason Penilla 2021-10-21 03:16:31 -05:00
parent c033fef26d
commit 8723ed4810
4 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build-data/mappings-patch.tiny
View file

@ -4,13 +4,12 @@ tiny 2 0 spigot mojang+yarn
# is imported and not fully qualified. Easiest fix is to just change the name
c net/minecraft/server/level/PlayerChunkMap$a net/minecraft/server/level/ChunkMap$ChunkDistanceManager
# CraftBukkit adds the getServer() method, clashes with a Mojang method
c net/minecraft/world/level/World net/minecraft/world/level/Level
m ()Lorg/bukkit/craftbukkit/CraftServer; getServer getCraftServer
# CraftBukkit adds the server field, clashes with a Mojang field
c net/minecraft/server/network/PlayerConnection net/minecraft/server/network/ServerGamePacketListenerImpl
# CB adds getPlayer()CraftPlayer, conflicts with getPlayer()ServerPlayer
m ()Lorg/bukkit/craftbukkit/entity/CraftPlayer; getPlayer getCraftPlayer
m (DDDFFLorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;)V a teleport
# CB adds int, ItemStack to end of params
m (Ljava/util/List;Ljava/util/function/UnaryOperator;Lnet/minecraft/world/item/ItemStack;ILnet/minecraft/world/item/ItemStack;)V a updateBookPages
# CraftBukkit adds the getType() method, clashes with a Mojang method
c net/minecraft/world/entity/EntityAreaEffectCloud net/minecraft/world/entity/AreaEffectCloud
@ -48,10 +47,6 @@ c net/minecraft/server/level/EntityPlayer net/minecraft/server/level/ServerPlaye
c net/minecraft/world/level/block/entity/IHopper net/minecraft/world/level/block/entity/Hopper
m ()Lnet/minecraft/world/level/World; getWorld getLevel
# Teleport method in ServerGamePacketListenerImpl
c net/minecraft/server/network/PlayerConnection net/minecraft/server/network/ServerGamePacketListenerImpl
m (DDDFFLorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;)V a teleport
# Commands performCommand adds a stripSlash boolean
c net/minecraft/commands/CommandDispatcher net/minecraft/commands/Commands
m (Lnet/minecraft/commands/CommandListenerWrapper;Ljava/lang/String;Ljava/lang/String;Z)I a performCommand

10
build-data/paper.at
View file

@ -79,7 +79,7 @@ public net.minecraft.world.entity.animal.Turtle isTravelling()Z
public net.minecraft.world.entity.animal.Turtle setTravelling(Z)V
# Call player spectator target event
public net.minecraft.server.network.ServerGamePacketListenerImpl a(Ljava/util/List;Ljava/util/function/UnaryOperator;Lnet/minecraft/world/item/ItemStack;ILnet/minecraft/world/item/ItemStack;)V # todo fix this mapping
public net.minecraft.server.network.ServerGamePacketListenerImpl updateBookPages(Ljava/util/List;Ljava/util/function/UnaryOperator;Lnet/minecraft/world/item/ItemStack;ILnet/minecraft/world/item/ItemStack;)V
# Improve Server THread Pool
public net.minecraft.Util onThreadException(Ljava/lang/Thread;Ljava/lang/Throwable;)V
@ -219,12 +219,6 @@ public net.minecraft.world.entity.animal.Fox setFaceplanted(Z)V
# Cook speed multipler API
public net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity recipeType
# Improve CraftChunk#getEntities
public net.minecraft.world.level.entity.PersistentEntitySectionManager sectionStorage
# Optimize light engine
public-f net.minecraft.world.level.chunk.DataLayer
# Add methods to get translation keys
public org.bukkit.craftbukkit.inventory.CraftMetaFirework
public org.bukkit.craftbukkit.inventory.CraftMetaFirework getNBT(Lorg/bukkit/FireworkEffect$Type;)I
@ -250,5 +244,5 @@ public net.minecraft.world.level.block.entity.BlockEntityType validBlocks
# Default entity attributes
public net.minecraft.world.entity.ai.attributes.AttributeSupplier instances
# Add ItemFactory#getMonsterEgg API
# Add ItemFactory#getSpawnEgg API
public net.minecraft.world.item.SpawnEggItem BY_ID

6
patches/server/Optimize-NibbleArray-to-use-pooled-buffers.patch
View file

@ -87,7 +87,7 @@ diff --git a/src/main/java/net/minecraft/world/level/chunk/DataLayer.java b/src/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/chunk/DataLayer.java
+++ b/src/main/java/net/minecraft/world/level/chunk/DataLayer.java
@@ -0,0 +0,0 @@ public class DataLayer {
@@ -0,0 +0,0 @@ public final class DataLayer {
private static final int NIBBLE_SIZE = 4;
@Nullable
protected byte[] data;
@ -153,7 +153,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (bytes.length != 2048) {
throw (IllegalArgumentException) Util.pauseInIde((Throwable) (new IllegalArgumentException("DataLayer should be 2048 bytes not: " + bytes.length)));
}
@@ -0,0 +0,0 @@ public class DataLayer {
@@ -0,0 +0,0 @@ public final class DataLayer {
private void set(int index, int value) {
if (this.data == null) {
@ -163,7 +163,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
int k = DataLayer.getByteIndex(index);
@@ -0,0 +0,0 @@ public class DataLayer {
@@ -0,0 +0,0 @@ public final class DataLayer {
public byte[] getData() {
if (this.data == null) {
this.data = new byte[2048];

8
patches/server/Rewrite-the-light-engine.patch
View file

@ -4279,7 +4279,7 @@ diff --git a/src/main/java/net/minecraft/world/level/chunk/DataLayer.java b/src/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/chunk/DataLayer.java
+++ b/src/main/java/net/minecraft/world/level/chunk/DataLayer.java
@@ -0,0 +0,0 @@ public class DataLayer {
@@ -0,0 +0,0 @@ public final class DataLayer {
public static final int SIZE = 2048;
private static final int NIBBLE_SIZE = 4;
@Nullable
@ -4288,7 +4288,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
// Paper start
public static byte[] EMPTY_NIBBLE = new byte[2048];
private static final int nibbleBucketSizeMultiplier = Integer.getInteger("Paper.nibbleBucketSize", 3072);
@@ -0,0 +0,0 @@ public class DataLayer {
@@ -0,0 +0,0 @@ public final class DataLayer {
boolean poolSafe = false;
public java.lang.Runnable cleaner;
private void registerCleaner() {
@ -4296,7 +4296,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
if (!poolSafe) {
cleaner = net.minecraft.server.MCUtil.registerCleaner(this, this.data, DataLayer::releaseBytes);
} else {
@@ -0,0 +0,0 @@ public class DataLayer {
@@ -0,0 +0,0 @@ public final class DataLayer {
}
public DataLayer(byte[] bytes, boolean isSafe) {
this.data = bytes;
@ -4305,7 +4305,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
registerCleaner();
// Paper end
if (bytes.length != 2048) {
@@ -0,0 +0,0 @@ public class DataLayer {
@@ -0,0 +0,0 @@ public final class DataLayer {
}
// Paper end
public DataLayer copy() {