Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e574412 Replace ConfiguredStructure api with Structure (#8642)
PaperMC/Paper@a172880 Update ForgeFlower to 2.0.627.2, fixes dev bundle not applying with Java 19 runtime
PaperMC/Paper@4151f75 /paper entity list QOL improvements (#8876)
PaperMC/Paper@8a815a0 Fix rendering for translatable death messages (#8534)
PaperMC/Paper@d30cda1 Add TeleportFlags (#8855)
PaperMC/Paper@3dcf4e4 Add EntityFertilizeEggEvent (#8041)
PaperMC/Paper@f2075c4 Take in account waterlogged block for the event (#8623)
PaperMC/Paper@e5e75dd Include previous spawn angle in SpawnChangeEvent (#8606)
PaperMC/Paper@541753b Fix HumanEntity#drop not updating the client inventory (#6761)
This commit is contained in:
granny
2023-03-05 03:32:31 -08:00
parent 3940c828a6
commit ade1ed1d98
31 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0008-Ridables.patch
View File

@@ -22,7 +22,7 @@ index b1d12c78edf21cc29a9f9ca54e7957ddc8875ffb..a3e398d3bcc88f9c0feaa6ca8dc646f3
super(x, y, z);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 861cd9f092a19aca520c2be4ba7a6ee3d9aee263..7191a7e9a7fcb4268c5aaf85bf9c896fa2bfd676 100644
index 51163298e6ce111bdb19d55ce367cd69c7fe5f89..f145f11d95d767f9e3483934dff882e14e73f144 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1517,6 +1517,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -34,7 +34,7 @@ index 861cd9f092a19aca520c2be4ba7a6ee3d9aee263..7191a7e9a7fcb4268c5aaf85bf9c896f
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index ccb905ad68465199516534a2ab74f7b3092297a8..af87c06e9a135ed22ea575d36d739951707b3c66 100644
index 485fa33df4ca52be51b8e095b5e63fe67eb63ea0..cbde5ff539768c8c787709b1f5ff893ddb99e950 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -46,7 +46,7 @@ index ccb905ad68465199516534a2ab74f7b3092297a8..af87c06e9a135ed22ea575d36d739951
final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f3024b03ff7709893d6e39f54504597bb59f5315..f6360f2973c03e0105361f9e001360ec01488ce6 100644
index e226c784118bf682560678c5cac08b0777be2837..19cff8ba18d28f4c7cc7dfc71ce6ce3501b7bcb8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -701,6 +701,15 @@ public class ServerPlayer extends Player {
@@ -66,7 +66,7 @@ index f3024b03ff7709893d6e39f54504597bb59f5315..f6360f2973c03e0105361f9e001360ec
public void doTick() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9c5f191205b5f413890e78e316a08e6f5542bdc1..422c06e58f8dce24127a2178d3d23cdd034a2369 100644
index 564ded1c42675917915f70de6c62324641aba5af..d598c5097a96fae63e146857fe9e7173e3e8c831 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -716,7 +716,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2076,7 +2076,7 @@ index b05b560b7570e97bc234b75f26233909fcf575b3..7df3ee0f4b1a467d95f3eade65c0846b
return "entity.minecraft.tropical_fish.predefined." + variant;
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
index 25503678e7d049a8b3172cfad8a5606958c32302..1d188320b10a640e4667b775e996b4fcdd5a1e73 100644
index 7f9ec1888eb9c02705426d60cf4e3aa7c6d43115..aec5d241d6461b93e1776615bfa882c89ca5836a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -82,6 +82,23 @@ public class Turtle extends Animal {
@@ -2329,7 +2329,7 @@ index 02219f5ca614fefffa1ceb3c7036dfe1c90c8676..ac7b58d4ad0e3c3d3fe8aaf7a6b42377
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
index 0a051c7e7f5a172a9b906de04ef2a0419eda26eb..844004cefd85fdc3fb1628449e8452bd6207a77b 100644
index d1cc0ffd153c0902f0110adbbcd98f1d2089fa27..645e2446d1a68ea9c2ba0c2f7cb8117cc00bace9 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
@@ -84,16 +84,65 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
@@ -2399,7 +2399,7 @@ index 0a051c7e7f5a172a9b906de04ef2a0419eda26eb..844004cefd85fdc3fb1628449e8452bd
@Override
protected Brain.Provider<Frog> brainProvider() {
return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
@@ -383,7 +432,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
@@ -394,7 +443,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
return world.getBlockState(pos.below()).is(BlockTags.FROGS_SPAWNABLE_ON) && isBrightEnoughToSpawn(world, pos);
}
@@ -2928,7 +2928,7 @@ index c7caaebfb4b9f28cbe700d88fdcf232a500e8ca7..7506ba57b1e5488d50ee577ed6147e7f
this.dragonFight.updateDragon(this);
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index b781c849737225c00f1dd8d45a6d08cebc000263..7b715180a95e6990581ce28621f2176078ba14c2 100644
index 08a432f76a72ad628b8febe393196286182fbe07..2be183e14940c1fda9a6536f55b2400ffa3938cf 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -83,16 +83,30 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -4094,7 +4094,7 @@ index cec545c3baa6599d47b9cf1a4b97de8771062a22..a12352cb50edd8bd7a8f514e714e352b
this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false));
diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
index 6a0b4f86e5157494a917cf5efecb730081bae628..e497d0ff3cafd16d3aed9a858a506d1c6f4e140a 100644
index 40443f7d0c9f5697f529bfbbd16695c00bbd7322..27dd3f7c3fa5e7602d87976be7d00ce9d9cb9be2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
@@ -69,14 +69,39 @@ public class Ravager extends Raider {
@@ -5115,7 +5115,7 @@ index e92e6fb4cf97f4d5406b5b5d5786bfa5fb55f536..64fb6f2ea7b792d131feca7278034336
this.setTradingPlayer(player);
this.openTradingScreen(player, this.getDisplayName(), 1);
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index f6e4194856d4a2710a169b5823e74da1ba2c9130..bc9198a76f6b5aa5d526882e214d731d5b06f52b 100644
index 1116116e4ba6c5ecec400cd371b70b9e14efd92b..34906d3237388d548604de2577f64ff084ed0838 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -194,6 +194,19 @@ public abstract class Player extends LivingEntity {
@@ -5156,10 +5156,10 @@ index 4132c1113f5437a776e5e3c1cb306904775aed88..1a945a32c3d3705a318ebca72a365931
public void tick() {
super.tick();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 78f53ee557276de85f0431ebcb146445b1f4fb92..ba898640a8f693e8bae43281b170d3505154b273 100644
index 750ac80eed6ba03e138dd4c03f57ddfe4a123276..6cb23251487a1e61cef636b631145421527d1d80 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1404,4 +1404,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1407,4 +1407,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return !this.getHandle().level.noCollision(this.getHandle(), aabb);
}
// Paper End - Collision API