mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-22 11:18:15 +02:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@5027a22c fix test PaperMC/Paper@7b1b5f66 applyOrMoveSourcePatches for pre-2 PaperMC/Paper@743ab685 set updatingMinecraft flag PaperMC/Paper@17d72ad2 26.1-rc-1 PaperMC/Paper@42c355e0 update to rc2 PaperMC/Paper@890e3cd4 fix setPlayerTime's rate, call TimeSkipEvent for time set <markerId> PaperMC/Paper@8077ce40 cleanup PlayerInteractEvent PaperMC/Paper@5f86e092 Start porting feature patches PaperMC/Paper@5ba0e30a More feature patches PaperMC/Paper@1abe8fe5 Apply redstone patches PaperMC/Paper@3dfcd069 Simplify CraftStructureManager#loadStructure PaperMC/Paper@392f8bf3 26.1-rc-3
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/net/minecraft/world/level/Level.java
|
||||
+++ b/net/minecraft/world/level/Level.java
|
||||
@@ -162,10 +_,54 @@
|
||||
@@ -168,10 +_,54 @@
|
||||
}
|
||||
// Paper end - add paper world config
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
public CraftWorld getWorld() {
|
||||
return this.world;
|
||||
}
|
||||
@@ -208,6 +_,8 @@
|
||||
@@ -214,6 +_,8 @@
|
||||
) {
|
||||
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName()); // Spigot
|
||||
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
|
||||
@@ -64,7 +64,7 @@
|
||||
this.generator = generator;
|
||||
this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment);
|
||||
|
||||
@@ -1472,4 +_,14 @@
|
||||
@@ -1489,4 +_,14 @@
|
||||
return ret;
|
||||
}
|
||||
// Paper end - allow patching this logic
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/net/minecraft/world/level/block/Blocks.java
|
||||
+++ b/net/minecraft/world/level/block/Blocks.java
|
||||
@@ -6726,6 +_,7 @@
|
||||
@@ -6727,6 +_,7 @@
|
||||
BlockBehaviour.Properties.of()
|
||||
.mapColor(MapColor.PLANT)
|
||||
.forceSolidOff()
|
||||
@@ -8,7 +8,7 @@
|
||||
.instabreak()
|
||||
.sound(SoundType.AZALEA)
|
||||
.noOcclusion()
|
||||
@@ -6737,6 +_,7 @@
|
||||
@@ -6738,6 +_,7 @@
|
||||
BlockBehaviour.Properties.of()
|
||||
.mapColor(MapColor.PLANT)
|
||||
.forceSolidOff()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/net/minecraft/world/level/block/entity/SignBlockEntity.java
|
||||
+++ b/net/minecraft/world/level/block/entity/SignBlockEntity.java
|
||||
@@ -149,16 +_,32 @@
|
||||
@@ -150,16 +_,32 @@
|
||||
return this.setText(function.apply(text), isFrontText);
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -308,6 +_,27 @@
|
||||
@@ -309,6 +_,27 @@
|
||||
commandSource, Vec3.atCenterOf(pos), Vec2.ZERO, level, LevelBasedPermissionSet.GAMEMASTER, textName, displayName, level.getServer(), player // Paper - Fix commands from signs not firing command events
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/net/minecraft/world/level/block/state/BlockBehaviour.java
|
||||
+++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
|
||||
@@ -88,7 +_,7 @@
|
||||
@@ -87,7 +_,7 @@
|
||||
Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP
|
||||
};
|
||||
public final boolean hasCollision;
|
||||
|
||||
Reference in New Issue
Block a user