Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-21 15:59:23 +00:00
Code Issues Releases Activity

fix conflicts

Browse Source
This commit is contained in:
NONPLAYT
2024-03-01 00:12:11 +03:00
parent db913a4709
commit 847f4b3de7
13 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0001-Divine-Branding.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Divine Branding
diff --git a/build.gradle.kts b/build.gradle.kts
index 6bceca84bd073e25fc9aa19b8b713a2873713696..76faa8e9965d0743fc51eb2d6e6838dd9e85dfba 100644
index 32366253c04c493135f2b22d1940f83669104723..eb9275ef95b0caaa04a28278ff08f3fc94a99063 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
@@ -17,7 +17,7 @@ index 6bceca84bd073e25fc9aa19b8b713a2873713696..76faa8e9965d0743fc51eb2d6e6838dd
implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
exclude("io.papermc.paper", "paper-api")
}
@@ -93,7 +93,7 @@ tasks.jar {
@@ -94,7 +94,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -211,7 +211,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..7bbbdf2895776f12ebc153dc83f4d53b
if (stream != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index e9fc2b4661f5275b93db5d3fdf25a8bdc3b38920..e14a5be13af47162c3f03f7d75ecbe10799bc907 100644
index efe25d3894f3ad000257c72d9a5e06ef22446d41..486f69a94f3a5dfd1b13a74fcf780ff8f9ab37ba 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -231,7 +231,7 @@ public class PurpurConfig {

20
patches/server/0005-Add-missing-purpur-config-options.patch
View File

@@ -33,7 +33,7 @@ index c783ce59ea766e6c46a3313628b961f27e01ee8b..4f6b6967f7f632752fcc4faac47dca51
protected Brain.Provider<Allay> brainProvider() {
return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES);
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index fb50a3f3665cca4bb2e586fbd73c580a5d691f69..264bbd782e503d75e0b3d1c087e875b75ad22490 100644
index 41773acc8e8e27daa1fe43726939b2d95da92c30..c92ddc7ea45b6044c9206b9196d49fe05b42689d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -97,6 +97,18 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@@ -84,10 +84,10 @@ index d6340d0a1308bafd3ba176562bf08dcadec02b34..bc991589effff1a0c9bd48a16c7d460b
protected Brain.Provider<Frog> brainProvider() {
return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
index 14135dac80dec4224715e21cef6556d22e569026..e0e1a29abef0415f0e1a2a65dc15e9c715de148e 100644
index 2a9c2a69a0589e4e7b7c79d3716376b360a2eba1..b12b79765301782202abfe6b6da2b279a015e927 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
@@ -89,6 +89,23 @@ public class Tadpole extends AbstractFish {
@@ -92,6 +92,23 @@ public class Tadpole extends AbstractFish {
}
// Purpur end
@@ -163,11 +163,11 @@ index bf7ef72a7d92db8f11789a69583270644de0dac7..1bcdee570baf1499d660d019cf03b66d
public Packet<ClientGamePacketListener> getAddEntityPacket() {
return new ClientboundAddEntityPacket(this, this.hasPose(Pose.EMERGING) ? 1 : 0);
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
index bc3fe45d12ffc2069a03d1587b7623d31130565a..81aecab9e7d11237a441aa6f92440add9223afe5 100644
index 58af87b8faf4f8d6bdb111c49a429466acface68..bbadae5873db4b49273b054c1921a401f119fc3a 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/ChestBoat.java
@@ -30,6 +30,9 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
import org.bukkit.entity.HumanEntity;
@@ -32,6 +32,9 @@ import org.bukkit.entity.HumanEntity;
import org.bukkit.event.entity.EntityRemoveEvent;
import org.bukkit.inventory.InventoryHolder;
// CraftBukkit end
+// DivineMC start
@@ -176,7 +176,7 @@ index bc3fe45d12ffc2069a03d1587b7623d31130565a..81aecab9e7d11237a441aa6f92440add
public class ChestBoat extends Boat implements HasCustomInventoryScreen, ContainerEntity {
@@ -41,7 +44,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
@@ -43,7 +46,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
public ChestBoat(EntityType<? extends Boat> type, Level world) {
super(type, world);
@@ -185,7 +185,7 @@ index bc3fe45d12ffc2069a03d1587b7623d31130565a..81aecab9e7d11237a441aa6f92440add
}
public ChestBoat(Level world, double d0, double d1, double d2) {
@@ -161,7 +164,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
@@ -170,7 +173,7 @@ public class ChestBoat extends Boat implements HasCustomInventoryScreen, Contain
@Override
public int getContainerSize() {
@@ -195,7 +195,7 @@ index bc3fe45d12ffc2069a03d1587b7623d31130565a..81aecab9e7d11237a441aa6f92440add
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 7d24b3177c41661bbd35d51e7e33dedc2fc69d2c..987f6fcf7b5e4f9144ecee865e19d1354ba5a425 100644
index fe4c1659f0ca111db8a6d2d6b06d1783872705d6..80a5df11f57fb39a71461b774f0f5bcf94cd4c5c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -328,6 +328,7 @@ public class PurpurConfig {
@@ -215,7 +215,7 @@ index 7d24b3177c41661bbd35d51e7e33dedc2fc69d2c..987f6fcf7b5e4f9144ecee865e19d135
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a78173ac1a8a71048bd6dbad84c0163e51cd150f..6d98a94b0a3eab30914c5df2def4e092f1c7921f 100644
index 65ac86d07aeabb019132e180e5ed6b197e9ccad3..de37ef8ad67708c7557d087f2600d7448b634592 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1180,7 +1180,17 @@ public class PurpurWorldConfig {

4
patches/server/0007-Fix-entity-serialization.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix entity serialization
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index f6c9bff8ef4e370dcb351490294181282ad156e3..bc0abec15b6d8e1299a0d8c86265027e74c705d1 100644
index 2092ede561d14ace1c003ced051cd4967bb41beb..1d0804ba5ecbd1b63a7b4c92e04570938bcb93c4 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2343,15 +2343,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2356,15 +2356,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
}

4
patches/server/0008-Don-t-save-Fireworks.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Don't save Fireworks
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
index 7005b3a26e9b5d79064981a4a41bee21b65a9fc3..1dfe386460d1de7034b4e9416b120f07875261bb 100644
index 5b3b59057b962438c6f4fc8a1507342865b3bc11..f09388fa1fb3a84da4678ea46761a55872a03cc8 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
@@ -352,4 +352,11 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
@@ -355,4 +355,11 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
public boolean isAttackable() {
return false;
}

4
patches/server/0013-Despawn-shulker-bullets-on-owner-death.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Despawn shulker bullets on owner death
diff --git a/src/main/java/net/minecraft/world/entity/projectile/ShulkerBullet.java b/src/main/java/net/minecraft/world/entity/projectile/ShulkerBullet.java
index da0b7ee796c335875914481a5deda5eef5ddd442..ab1127b384cfd8a39543003b692121cc2ed74b4e 100644
index 1c50c870e59c35a39c83a0f136ee5d3c70268763..51077190b147e58b547c059abf0088715b37fea8 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/ShulkerBullet.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/ShulkerBullet.java
@@ -218,6 +218,17 @@ public class ShulkerBullet extends Projectile {
@@ -221,6 +221,17 @@ public class ShulkerBullet extends Projectile {
Vec3 vec3d;
if (!this.level().isClientSide) {

4
patches/server/0014-Fix-MC-31819.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-31819
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 a334e2f83905be450514a9c26e945f6d5076060b..c92242c6acd9da906aa332c84ad8a2f6d98f6f63 100644
index 43199815ffe3d666577390b96187aa898ceb910e..a7ea4d1bef425f43a6854e719660cda6c29cabfa 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1906,6 +1906,11 @@ public abstract class Player extends LivingEntity {
@@ -1914,6 +1914,11 @@ public abstract class Player extends LivingEntity {
}
public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) {

4
patches/server/0015-Reduce-sensor-work.patch
View File

@@ -7,10 +7,10 @@ Original project: Bloom-host/Petal
Link: https://github.com/Bloom-host/Petal
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index cc490788b18209d27b339a8557084049002cff09..34e80ae2a8cb4d2cebb7b5a739917aa19e8e1ca0 100644
index bfa69b2c37f07132f8b31c12d26f4ceb074901a5..9a391877770ecc69f040bb1b3aae51129a479f37 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1038,20 +1038,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1046,20 +1046,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
if (entity != null) {

4
patches/server/0016-Fix-MC-172801.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Fix MC-172801
Original post on Mojira: https://bugs.mojang.com/browse/MC-172801
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 34e80ae2a8cb4d2cebb7b5a739917aa19e8e1ca0..c3fbd275f0471c64bf0c7e22d796f4ad8178de79 100644
index 9a391877770ecc69f040bb1b3aae51129a479f37..920af22a228a4debcd0384c843c7e964cc958405 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3086,7 +3086,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3094,7 +3094,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
protected float getFlyingSpeed() {

6
patches/server/0017-Fix-MC-2025.patch
View File

@@ -7,10 +7,10 @@ Original post on Mojira: https://bugs.mojang.com/browse/MC-2025
Fix taken from Reddit: https://redd.it/8pgd4q
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index bc0abec15b6d8e1299a0d8c86265027e74c705d1..b342801c8d336b51edccd84f15e6e1e8c7237e5d 100644
index 1d0804ba5ecbd1b63a7b4c92e04570938bcb93c4..d72d703308de39ff769e4311e2349f5fb13e7912 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2506,6 +2506,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2522,6 +2522,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
nbttagcompound.putBoolean("Purpur.FireImmune", immuneToFire);
}
// Purpur end
@@ -28,7 +28,7 @@ index bc0abec15b6d8e1299a0d8c86265027e74c705d1..b342801c8d336b51edccd84f15e6e1e8
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2583,6 +2594,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2599,6 +2610,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
this.reapplyPosition();
}

20
patches/server/0020-Make-entity-goals-public.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Make entity goals public
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
index bdb78cc701543cfe91a6bafd1786fe2ea0bf1ddc..40c31cc3a83a8776d396d5d14fce8c795ab08bd3 100644
index 997ab942be9f742804041b07d607e7dd6473ba96..aea0b36a52b2e9794daf8043f6a4279e52fec931 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -774,7 +774,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -90,7 +90,7 @@ index bdb78cc701543cfe91a6bafd1786fe2ea0bf1ddc..40c31cc3a83a8776d396d5d14fce8c79
BaseBeeGoal() {}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
index 6e5b4a50b8d2dddbd7f099426b4866b35bcb798a..2bcd475cca90d356de056f9b8f023d0d6392fe44 100644
index 6af5e1dfcfd739e0bc857f648c189151d5a795c8..149ff2637ca70e26cb7a36ae35ed82508183daa7 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
@@ -568,7 +568,7 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
@@ -112,10 +112,10 @@ index 6e5b4a50b8d2dddbd7f099426b4866b35bcb798a..2bcd475cca90d356de056f9b8f023d0d
private final Cat cat;
diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
index 06d52d8b61abc4dbbdc953bfed2e688be377b3cc..a5490068d200ed78ca720ae804a1b26faa4cba7f 100644
index d5becd13774f9a2ead77d58e777ffc9aea10cb60..7c9ed0f28116d4aad6bbabd5d710cd4bbfbd59dd 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
@@ -99,7 +99,7 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
@@ -103,7 +103,7 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
super.registerGoals();
this.goalSelector.addGoal(0, new FloatGoal(this));
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
@@ -125,7 +125,7 @@ index 06d52d8b61abc4dbbdc953bfed2e688be377b3cc..a5490068d200ed78ca720ae804a1b26f
this.goalSelector.addGoal(8, new RandomStrollGoal(this, 0.6D));
this.goalSelector.addGoal(9, new LookAtPlayerGoal(this, Player.class, 15.0F, 1.0F));
diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
index ffe956f200dd0b4148043d0d7f2eac007a9f22b1..a5608ddd34afd96ac166758f5d8ec88ed92d34cd 100644
index ee9d5933f74584452a1b27a392e7d36dac5b9bc9..bda187a54fab35059565219a6aa7c32406dcfe9a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
@@ -97,7 +97,7 @@ public class Vindicator extends AbstractIllager {
@@ -138,10 +138,10 @@ index ffe956f200dd0b4148043d0d7f2eac007a9f22b1..a5608ddd34afd96ac166758f5d8ec88e
this.targetSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, Raider.class)).setAlertOthers());
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
index 300411e88cdaef7e0ce280edbd5f18fa8d004a33..80e0a66abd9cd6ad9135658adb3044f97e0b7ba1 100644
index b3912881892b4f1bca577761083c5da1568c8187..5e8c9177644896d8f9243c3e7ce903fcdc6e9fa2 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
+++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
@@ -352,7 +352,7 @@ public abstract class Raider extends PatrollingMonster {
@@ -355,7 +355,7 @@ public abstract class Raider extends PatrollingMonster {
}
}
@@ -150,12 +150,12 @@ index 300411e88cdaef7e0ce280edbd5f18fa8d004a33..80e0a66abd9cd6ad9135658adb3044f9
private final Raider raider;
private final double speedModifier;
@@ -500,7 +500,7 @@ public abstract class Raider extends PatrollingMonster {
@@ -503,7 +503,7 @@ public abstract class Raider extends PatrollingMonster {
}
}
- protected class HoldGroundAttackGoal extends Goal {
+ public static class HoldGroundAttackGoal extends Goal { // DivineMC - protected -> public static
- public class HoldGroundAttackGoal extends Goal {
+ public static class HoldGroundAttackGoal extends Goal { // DivineMC - public -> public static
private final Raider mob;
private final float hostileRadiusSqr;

8
patches/server/0026-Configurable-Chat-message-signatures.patch
View File

@@ -57,7 +57,7 @@ index c40979e2fa37acb2f3df493395f3ab6e185345d7..826e4a8618db5328ad2df21fd08e5b1c
public static record Favicon(byte[] iconBytes) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 2bb3735d650c5cb379f5a52cb9ae2e7d5df3803d..b7edd3581873c20b596f8bca2a2ba2a8b77be3d6 100644
index 41cffa00d4978f46b47ac6ede2da2a256796a0ba..9fa9a1e1efab58f3133b32517bb04c2ec708816d 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -682,6 +682,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -143,10 +143,10 @@ index 02e65b0bd212d46855baee48fab35dc95a88b43f..9d9c1bc8bdf55998172bca5edf78d9b8
if (packet == null || this.processedDisconnect) { // Spigot
return;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 323391509c2efd49c54d7b36d7aa880c63ae5fd4..964b6df964fa4f74bef37f2f19683e5d2443e5ab 100644
index ac1e0c66f167218306504db6037cc1d6509072a0..7784a81f2b861e1f5c9dd7a7885e8be70b89bc8a 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1468,7 +1468,7 @@ public abstract class PlayerList {
@@ -1469,7 +1469,7 @@ public abstract class PlayerList {
// Paper end
boolean flag = this.verifyChatTrusted(message);
@@ -155,7 +155,7 @@ index 323391509c2efd49c54d7b36d7aa880c63ae5fd4..964b6df964fa4f74bef37f2f19683e5d
OutgoingChatMessage outgoingchatmessage = OutgoingChatMessage.create(message);
boolean flag1 = false;
@@ -1497,6 +1497,7 @@ public abstract class PlayerList {
@@ -1498,6 +1498,7 @@ public abstract class PlayerList {
}
public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public

6
patches/server/0037-lithium-entity.fast_elytra_check-entity.fast_hand_sw.patch
View File

@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under LGPL v3
You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index c3fbd275f0471c64bf0c7e22d796f4ad8178de79..c23b12b47d461cf9615ccc4004c6dd77202d213d 100644
index 920af22a228a4debcd0384c843c7e964cc958405..0da35320a9215dc4f152d4ea977c421ea40a4a1b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2615,6 +2615,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2623,6 +2623,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
protected void updateSwingTime() {
@@ -18,7 +18,7 @@ index c3fbd275f0471c64bf0c7e22d796f4ad8178de79..c23b12b47d461cf9615ccc4004c6dd77
int i = this.getCurrentSwingDuration();
if (this.swinging) {
@@ -3652,6 +3653,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3660,6 +3661,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
private void updateFallFlying() {

8
patches/server/0045-vmp-skip-entity-move-if-movement-is-zero.patch
View File

@@ -7,10 +7,10 @@ Original code by RelativityMC, licensed under MIT
You can find the original code on https://github.com/RelativityMC/VMP-fabric (Yarn mappings)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b342801c8d336b51edccd84f15e6e1e8c7237e5d..b8f43a8b588d44988ce1fe94aa8550b862093743 100644
index d72d703308de39ff769e4311e2349f5fb13e7912..8dd5ec2dd8f87fdb183ae4508c576481af3db20d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -316,6 +316,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -317,6 +317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
public float yRotO;
public float xRotO;
private AABB bb;
@@ -18,7 +18,7 @@ index b342801c8d336b51edccd84f15e6e1e8c7237e5d..b8f43a8b588d44988ce1fe94aa8550b8
public boolean onGround;
public boolean horizontalCollision;
public boolean verticalCollision;
@@ -1106,6 +1107,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1119,6 +1120,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
// Paper end - detailed watchdog information
public void move(MoverType movementType, Vec3 movement) {
@@ -31,7 +31,7 @@ index b342801c8d336b51edccd84f15e6e1e8c7237e5d..b8f43a8b588d44988ce1fe94aa8550b8
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
// Paper start - detailed watchdog information
io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
@@ -4149,6 +4156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -4165,6 +4172,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
public final void setBoundingBox(AABB boundingBox) {