From 20b745d96a9234ee7b45b0b220d2421f5d356f9d Mon Sep 17 00:00:00 2001 From: "Rhythmic (Illo)" <45906780+RhythmicSys@users.noreply.github.com> Date: Tue, 25 Oct 2022 01:26:55 -0700 Subject: [PATCH] Allow Transparent Blocks In Enchanting Box (#1161) Co-authored-by: granny --- ...leport-to-spawn-if-outside-world-bor.patch | 6 +-- .../0084-Totems-work-in-inventory.patch | 4 +- ...iefing-bypass-to-everything-affected.patch | 4 +- patches/server/0141-One-Punch-Man.patch | 4 +- patches/server/0155-Drowning-Settings.patch | 8 ++-- .../0171-Configurable-mob-blindness.patch | 6 +-- ...183-API-for-any-mob-to-burn-daylight.patch | 14 +++---- .../0212-Toggle-for-kinetic-damage.patch | 6 +-- .../0247-Mob-head-visibility-percent.patch | 4 +- ...fig-for-mob-last-hurt-by-player-time.patch | 8 ++-- .../server/0289-Remove-Mojang-Profiler.patch | 20 ++++----- .../0308-Milk-Keeps-Beneficial-Effects.patch | 6 +-- ...Transparent-Blocks-In-Enchanting-Box.patch | 41 +++++++++++++++++++ 13 files changed, 86 insertions(+), 45 deletions(-) create mode 100644 patches/server/0311-Allow-Transparent-Blocks-In-Enchanting-Box.patch diff --git a/patches/server/0079-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0079-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 4035aed9c..422785d3a 100644 --- a/patches/server/0079-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0079-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 80598d109eba14f719c4c8190d93d4a9febb9248..0d94b1e5ec66713c38e1f524be42bbfaa398dfde 100644 +index 1485d4ad594b44d885a532071d1243e633d7e905..7ece174d5d0387f34100ea2094a1e3cc26f216ab 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2586,4 +2586,26 @@ public class ServerPlayer extends Player { @@ -36,10 +36,10 @@ index 80598d109eba14f719c4c8190d93d4a9febb9248..0d94b1e5ec66713c38e1f524be42bbfa + // Purpur end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8401577ee010c211c99c174bc70536d606a09b1d..500b702e2d2b6ba4df07d1fb3e85d632feece76c 100644 +index 8401577ee010c211c99c174bc70536d606a09b1d..5230e9a58c9fb6f9e9ea9536b2d05cee0a24554a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -411,6 +412,7 @@ public abstract class LivingEntity extends Entity { +@@ -411,6 +411,7 @@ public abstract class LivingEntity extends Entity { double d1 = this.level.getWorldBorder().getDamagePerBlock(); if (d1 > 0.0D) { diff --git a/patches/server/0084-Totems-work-in-inventory.patch b/patches/server/0084-Totems-work-in-inventory.patch index eca239ef3..614309d49 100644 --- a/patches/server/0084-Totems-work-in-inventory.patch +++ b/patches/server/0084-Totems-work-in-inventory.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 500b702e2d2b6ba4df07d1fb3e85d632feece76c..4eb8920a94304dd12ea94850deda96ff841e024a 100644 +index 5230e9a58c9fb6f9e9ea9536b2d05cee0a24554a..e5602a601dac4c439542094e5f74d8dc46f85866 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1546,6 +1546,18 @@ public abstract class LivingEntity extends Entity { +@@ -1545,6 +1545,18 @@ public abstract class LivingEntity extends Entity { } } diff --git a/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch index 45dd5df85..121d41d85 100644 --- a/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4eb8920a94304dd12ea94850deda96ff841e024a..c53dd6fe11b6218a8b2985c53ca132423e09d88d 100644 +index e5602a601dac4c439542094e5f74d8dc46f85866..978eb615088ef84e418fe768b27f43276290ff46 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1718,7 +1718,7 @@ public abstract class LivingEntity extends Entity { +@@ -1717,7 +1717,7 @@ public abstract class LivingEntity extends Entity { boolean flag = false; if (this.dead && adversary instanceof WitherBoss) { // Paper diff --git a/patches/server/0141-One-Punch-Man.patch b/patches/server/0141-One-Punch-Man.patch index 701c6a9e8..1f0463964 100644 --- a/patches/server/0141-One-Punch-Man.patch +++ b/patches/server/0141-One-Punch-Man.patch @@ -5,10 +5,10 @@ Subject: [PATCH] One Punch Man! diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c53dd6fe11b6218a8b2985c53ca132423e09d88d..c5f0c5ce4e20670fe2a61e4775e01094a0d36ed6 100644 +index 978eb615088ef84e418fe768b27f43276290ff46..8272135f82a8b42e39f208b4d5758ce7d56d501e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2225,6 +2225,20 @@ public abstract class LivingEntity extends Entity { +@@ -2224,6 +2224,20 @@ public abstract class LivingEntity extends Entity { ((ServerPlayer) damagesource.getEntity()).awardStat(Stats.DAMAGE_DEALT_ABSORBED, Math.round(f2 * 10.0F)); } diff --git a/patches/server/0155-Drowning-Settings.patch b/patches/server/0155-Drowning-Settings.patch index a62fb5ebc..36c871b6d 100644 --- a/patches/server/0155-Drowning-Settings.patch +++ b/patches/server/0155-Drowning-Settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Drowning Settings diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6a914c3185bac2f3cce6c45d98012ed53fbdab24..c3be1e6d54862dc7e1615e4fe3771b8f38e44f8a 100644 +index e03bc5bd30b8a8960159edc855f7493bb6afd755..29974e78e864d19681a2eb4b35dad2063465acd4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3128,7 +3128,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -18,10 +18,10 @@ index 6a914c3185bac2f3cce6c45d98012ed53fbdab24..c3be1e6d54862dc7e1615e4fe3771b8f public int getAirSupply() { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c5f0c5ce4e20670fe2a61e4775e01094a0d36ed6..0c830930522c38a7baf689beebf65970e96c3461 100644 +index 8272135f82a8b42e39f208b4d5758ce7d56d501e..f7473ee8fc0ced687d76ee7d569c1d7cb7ae8f63 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -423,7 +423,7 @@ public abstract class LivingEntity extends Entity { +@@ -422,7 +422,7 @@ public abstract class LivingEntity extends Entity { if (flag1) { this.setAirSupply(this.decreaseAirSupply(this.getAirSupply())); @@ -30,7 +30,7 @@ index c5f0c5ce4e20670fe2a61e4775e01094a0d36ed6..0c830930522c38a7baf689beebf65970 this.setAirSupply(0); Vec3 vec3d = this.getDeltaMovement(); -@@ -435,7 +435,7 @@ public abstract class LivingEntity extends Entity { +@@ -434,7 +434,7 @@ public abstract class LivingEntity extends Entity { this.level.addParticle(ParticleTypes.BUBBLE, this.getX() + d2, this.getY() + d3, this.getZ() + d4, vec3d.x, vec3d.y, vec3d.z); } diff --git a/patches/server/0171-Configurable-mob-blindness.patch b/patches/server/0171-Configurable-mob-blindness.patch index d7c870fa1..bc5b9e9ec 100644 --- a/patches/server/0171-Configurable-mob-blindness.patch +++ b/patches/server/0171-Configurable-mob-blindness.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Configurable mob blindness Ported from https://github.com/raltsmc/mobblindness diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e11b9c477dabe9c5e00bf41739b0fe52f5ef2093..a0d3c0c15380cf42049e1b27d8c73ea8e1624b89 100644 +index f7473ee8fc0ced687d76ee7d569c1d7cb7ae8f63..bbeeee00e63b1ab72608d723f828a066d0621aec 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1011,6 +1011,17 @@ public abstract class LivingEntity extends Entity { +@@ -1010,6 +1010,17 @@ public abstract class LivingEntity extends Entity { if (entitytypes == EntityType.SKELETON && itemstack.is(Items.SKELETON_SKULL) || entitytypes == EntityType.ZOMBIE && itemstack.is(Items.ZOMBIE_HEAD) || entitytypes == EntityType.CREEPER && itemstack.is(Items.CREEPER_HEAD)) { d0 *= 0.5D; } @@ -28,7 +28,7 @@ index e11b9c477dabe9c5e00bf41739b0fe52f5ef2093..a0d3c0c15380cf42049e1b27d8c73ea8 return d0; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3fa0701635c5c429d8d836c47edcdb5b371dbbec..65c691cae79214e03eb5d719e5d9d65c564823a9 100644 +index b787b34b11f7379249575b058fe3a07a1a7d3d83..d5b2ff0a8527f074b3a0cd145086e5218d557c8a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -135,6 +135,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0183-API-for-any-mob-to-burn-daylight.patch b/patches/server/0183-API-for-any-mob-to-burn-daylight.patch index 459d8e039..211c4f5d8 100644 --- a/patches/server/0183-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0183-API-for-any-mob-to-burn-daylight.patch @@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight Co-authored by: Encode42 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c3be1e6d54862dc7e1615e4fe3771b8f38e44f8a..c44392af107fe4f5e3a77d69067f49cba2eee771 100644 +index 29974e78e864d19681a2eb4b35dad2063465acd4..ce844dfc6f01f3aa6463054174a41f6f3161ad7a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4634,5 +4634,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -31,10 +31,10 @@ index c3be1e6d54862dc7e1615e4fe3771b8f38e44f8a..c44392af107fe4f5e3a77d69067f49cb // Purpur end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3553f447f2c680799abf324b6f006af0346ab2f4..c649741c69b1ce80e822d4627527bd0147e53475 100644 +index bbeeee00e63b1ab72608d723f828a066d0621aec..d63ac92dce259322bbb5fa6f94ca4c85b7f533eb 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity { +@@ -264,6 +264,7 @@ public abstract class LivingEntity extends Entity { public boolean bukkitPickUpLoot; public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event @@ -42,7 +42,7 @@ index 3553f447f2c680799abf324b6f006af0346ab2f4..c649741c69b1ce80e822d4627527bd01 @Override public float getBukkitYaw() { -@@ -788,6 +789,7 @@ public abstract class LivingEntity extends Entity { +@@ -787,6 +788,7 @@ public abstract class LivingEntity extends Entity { dataresult.resultOrPartial(logger::error).ifPresent((nbtbase) -> { nbt.put("Brain", nbtbase); }); @@ -50,7 +50,7 @@ index 3553f447f2c680799abf324b6f006af0346ab2f4..c649741c69b1ce80e822d4627527bd01 } @Override -@@ -863,6 +865,11 @@ public abstract class LivingEntity extends Entity { +@@ -862,6 +864,11 @@ public abstract class LivingEntity extends Entity { this.brain = this.makeBrain(new Dynamic(NbtOps.INSTANCE, nbt.get("Brain"))); } @@ -62,7 +62,7 @@ index 3553f447f2c680799abf324b6f006af0346ab2f4..c649741c69b1ce80e822d4627527bd01 } // CraftBukkit start -@@ -3484,6 +3491,27 @@ public abstract class LivingEntity extends Entity { +@@ -3483,6 +3490,27 @@ public abstract class LivingEntity extends Entity { this.hurt(DamageSource.DROWN, 1.0F); } @@ -367,7 +367,7 @@ index fbddb90fdbaa99c5f243b6e93c55fc1f7430e337..403085673b87291799538f4f3aad2dfe /* * Order is *EXTREMELY* important -- keep it right! =D diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index c5c718c30418f682826f83d6a254e926684d660d..c4ef5b291cec71279d58ba50ff29956857aabd33 100644 +index aec6f37ceac8ba9a987edf3eb24bbc06d3b1613a..f2d17cb06fbcd7370ab8465c5c4830f8ba31169a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1001,5 +1001,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0212-Toggle-for-kinetic-damage.patch b/patches/server/0212-Toggle-for-kinetic-damage.patch index e397fb7e9..455c589e4 100644 --- a/patches/server/0212-Toggle-for-kinetic-damage.patch +++ b/patches/server/0212-Toggle-for-kinetic-damage.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c649741c69b1ce80e822d4627527bd0147e53475..323761e13936378ae4baf7cbdc429e4f34da7dca 100644 +index d63ac92dce259322bbb5fa6f94ca4c85b7f533eb..7422b01a63e395cb87f02a1a665f53b11755f5ee 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2884,6 +2884,7 @@ public abstract class LivingEntity extends Entity { +@@ -2883,6 +2883,7 @@ public abstract class LivingEntity extends Entity { if (f3 > 0.0F) { this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F); @@ -17,7 +17,7 @@ index c649741c69b1ce80e822d4627527bd0147e53475..323761e13936378ae4baf7cbdc429e4f } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index bb22fe9212141f1f8ddd040d701ada488c3c7fac..f3c0a717856cc1dda0c39bfe2d22897774df188b 100644 +index 209e92b0588ddfc820647710e443173b1e78887e..1f0c70c48472b64da299b79402b93ae9c57ba167 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -185,12 +185,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0247-Mob-head-visibility-percent.patch b/patches/server/0247-Mob-head-visibility-percent.patch index 0c8d3e594..60099502f 100644 --- a/patches/server/0247-Mob-head-visibility-percent.patch +++ b/patches/server/0247-Mob-head-visibility-percent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Mob head visibility percent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4089eee22e67a5b8f88c5a7bae0bb4d4c5b49824..bc671324119adf974d07249d7d74bdd6e5faa0ea 100644 +index 7422b01a63e395cb87f02a1a665f53b11755f5ee..bd0b864f7a1b029f9ebd242adbbe5575e8ce464d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1015,9 +1015,17 @@ public abstract class LivingEntity extends Entity { +@@ -1014,9 +1014,17 @@ public abstract class LivingEntity extends Entity { ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD); EntityType entitytypes = entity.getType(); diff --git a/patches/server/0264-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0264-Config-for-mob-last-hurt-by-player-time.patch index 998ce544f..c1566079b 100644 --- a/patches/server/0264-Config-for-mob-last-hurt-by-player-time.patch +++ b/patches/server/0264-Config-for-mob-last-hurt-by-player-time.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Config for mob last hurt by player time diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f04ce887e314110a136b4bff91d55d2ef35366b4..b391e04a1de88f465e609cbcd77ba97e3d851fb3 100644 +index bd0b864f7a1b029f9ebd242adbbe5575e8ce464d..4cdf6954c8f428df7ca91abd497416797ae246c5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1441,13 +1441,13 @@ public abstract class LivingEntity extends Entity { +@@ -1440,13 +1440,13 @@ public abstract class LivingEntity extends Entity { } if (entity1 instanceof net.minecraft.world.entity.player.Player) { @@ -25,7 +25,7 @@ index f04ce887e314110a136b4bff91d55d2ef35366b4..b391e04a1de88f465e609cbcd77ba97e if (entityliving != null && entityliving.getType() == EntityType.PLAYER) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 8a7c027a77122045aeebbdc20d00824ffe25526f..37bcc72ce132f7901460f25d700dba1bac6c210f 100644 +index d726575f8df0176f2ee0b19d224d49d9ee3f248f..9e192788af0b2ae5479c2fae1239b10e1ff45351 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -427,7 +427,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -38,7 +38,7 @@ index 8a7c027a77122045aeebbdc20d00824ffe25526f..37bcc72ce132f7901460f25d700dba1b // Paper end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8e99c1cdb378f18d790098bc628d67d0ea0ebd02..ca6eedfce3e5206c0d98fba4d5555889a4b20efe 100644 +index 485233cfa2a6414812ce7b67e761de6996beb589..bb8d288074da9a0316815cf9af862b2c52936549 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -145,6 +145,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0289-Remove-Mojang-Profiler.patch b/patches/server/0289-Remove-Mojang-Profiler.patch index 9948cb148..038918c92 100644 --- a/patches/server/0289-Remove-Mojang-Profiler.patch +++ b/patches/server/0289-Remove-Mojang-Profiler.patch @@ -754,7 +754,7 @@ index 550c3566b14aace0dbd4e77876abc2bb663bcf5c..c888e654ab9449bfdc7dfe16078eb078 while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 99ae8f9179a85d11abc797cdf3e5a9846082d82e..2f6bb9c37818824779170c784132673d43b70979 100644 +index 0d50fdc47564ee6d72fefdbf44b76937ea5383d4..8903d7679feadf35d0b33e39ce0b1a6907ffb5e5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1157,7 +1157,7 @@ public class ServerPlayer extends Player { @@ -1139,10 +1139,10 @@ index cd97d28e85a6795099ec314e9574aa413ff93156..30cbbdd312d7cc34db7b281524adb5aa } } else { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f994765477f01e8c6 100644 +index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996dc9cd35a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -397,7 +397,7 @@ public abstract class LivingEntity extends Entity { +@@ -396,7 +396,7 @@ public abstract class LivingEntity extends Entity { } super.baseTick(); @@ -1151,7 +1151,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547 if (this.fireImmune() || this.level.isClientSide) { this.clearFire(); } -@@ -501,7 +501,7 @@ public abstract class LivingEntity extends Entity { +@@ -500,7 +500,7 @@ public abstract class LivingEntity extends Entity { this.yHeadRotO = this.yHeadRot; this.yRotO = this.getYRot(); this.xRotO = this.getXRot(); @@ -1160,7 +1160,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547 } public boolean canSpawnSoulSpeedParticle() { -@@ -3089,10 +3089,10 @@ public abstract class LivingEntity extends Entity { +@@ -3088,10 +3088,10 @@ public abstract class LivingEntity extends Entity { } this.run += (f3 - this.run) * 0.3F; @@ -1174,7 +1174,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547 // Paper start - stop large pitch and yaw changes from crashing the server this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F; -@@ -3104,7 +3104,7 @@ public abstract class LivingEntity extends Entity { +@@ -3103,7 +3103,7 @@ public abstract class LivingEntity extends Entity { this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F; // Paper end @@ -1183,7 +1183,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547 this.animStep += f2; if (this.isFallFlying()) { ++this.fallFlyTicks; -@@ -3386,19 +3386,19 @@ public abstract class LivingEntity extends Entity { +@@ -3385,19 +3385,19 @@ public abstract class LivingEntity extends Entity { } this.setDeltaMovement(d4, d5, d6); @@ -1208,7 +1208,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547 if (this.jumping && this.isAffectedByFluids()) { double d7; -@@ -3425,8 +3425,8 @@ public abstract class LivingEntity extends Entity { +@@ -3424,8 +3424,8 @@ public abstract class LivingEntity extends Entity { this.noJumpDelay = 0; } @@ -1219,7 +1219,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547 this.xxa *= 0.98F; this.zza *= 0.98F; this.updateFallFlying(); -@@ -3435,8 +3435,8 @@ public abstract class LivingEntity extends Entity { +@@ -3434,8 +3434,8 @@ public abstract class LivingEntity extends Entity { // SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper this.travel(new Vec3((double) this.xxa, (double) this.yya, (double) this.zza)); // SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper @@ -1230,7 +1230,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547 boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES); int i; -@@ -3456,15 +3456,15 @@ public abstract class LivingEntity extends Entity { +@@ -3455,15 +3455,15 @@ public abstract class LivingEntity extends Entity { this.hurt(DamageSource.FREEZE, (float) i); } diff --git a/patches/server/0308-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0308-Milk-Keeps-Beneficial-Effects.patch index 887b1ae86..d7dd20844 100644 --- a/patches/server/0308-Milk-Keeps-Beneficial-Effects.patch +++ b/patches/server/0308-Milk-Keeps-Beneficial-Effects.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Milk Keeps Beneficial Effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 9dca0d694aa8fa7f8bec0d2504986085e0cc6fe9..ad4bd5fa9bcd085a1eb99c4da5fc95ebc126d028 100644 +index 2de1d338267dc69fdd509abe50145996dc9cd35a..1ec9a48f2f44f5bd647e0661423ae90970aee262 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -1096,6 +1096,7 @@ public abstract class LivingEntity extends Entity { +@@ -1095,6 +1095,7 @@ public abstract class LivingEntity extends Entity { for (flag = false; iterator.hasNext(); flag = true) { // CraftBukkit start MobEffectInstance effect = (MobEffectInstance) iterator.next(); @@ -17,7 +17,7 @@ index 9dca0d694aa8fa7f8bec0d2504986085e0cc6fe9..ad4bd5fa9bcd085a1eb99c4da5fc95eb if (event.isCancelled()) { continue; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a6356d19f0fc664be523f19c2ea1704191a7a73a..a70caf9a80c39840ea70539d3eedc767fee64872 100644 +index 77460b3c96f1b595bc398afe6507a0104d24b673..33d7c132b19095598eb681da8487a072f1dccab6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -131,6 +131,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0311-Allow-Transparent-Blocks-In-Enchanting-Box.patch b/patches/server/0311-Allow-Transparent-Blocks-In-Enchanting-Box.patch new file mode 100644 index 000000000..920ed2fed --- /dev/null +++ b/patches/server/0311-Allow-Transparent-Blocks-In-Enchanting-Box.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Rhythmic +Date: Sat, 15 Oct 2022 13:32:15 -0700 +Subject: [PATCH] Allow Transparent Blocks In Enchanting Box + + +diff --git a/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java b/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java +index 37a888e5db65b927094b43775ae9d4098244f809..c4a91d7f1320027ee6a2b364303c01ebbacde584 100644 +--- a/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/EnchantmentTableBlock.java +@@ -42,6 +42,10 @@ public class EnchantmentTableBlock extends BaseEntityBlock { + } + + public static boolean isValidBookShelf(Level world, BlockPos tablePos, BlockPos bookshelfOffset) { ++ // Purpur Start ++ if(org.purpurmc.purpur.PurpurConfig.allowTransparentBlocksInEnchantmentBox){ ++ return world.getBlockState(tablePos.offset(bookshelfOffset)).is(Blocks.BOOKSHELF) && !world.getBlockState(tablePos.offset(bookshelfOffset.getX() / 2, bookshelfOffset.getY(), bookshelfOffset.getZ() / 2)).isSuffocating(world, bookshelfOffset); ++ } // Purpur end + return world.getBlockState(tablePos.offset(bookshelfOffset)).is(Blocks.BOOKSHELF) && world.isEmptyBlock(tablePos.offset(bookshelfOffset.getX() / 2, bookshelfOffset.getY(), bookshelfOffset.getZ() / 2)); + } + +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +index 5d71e3040df116a94df7efa83e61dc1766cc4a93..ccca392a45cb05abb55ddd5c6c36e6f9c7a5d171 100644 +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +@@ -432,6 +432,7 @@ public class PurpurConfig { + public static boolean allowInfinityMending = false; + public static boolean allowCrossbowInfinity = false; + public static boolean allowShearsLooting = false; ++ public static boolean allowTransparentBlocksInEnchantmentBox = false; + public static boolean allowUnsafeEnchants = false; + public static boolean allowInapplicableEnchants = true; + public static boolean allowIncompatibleEnchants = true; +@@ -455,6 +456,7 @@ public class PurpurConfig { + allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending); + allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity); + allowShearsLooting = getBoolean("settings.enchantment.allow-looting-on-shears", allowShearsLooting); ++ allowTransparentBlocksInEnchantmentBox = getBoolean("settings.enchantment.allow-transparent-blocks-in-enchantment-box", allowTransparentBlocksInEnchantmentBox); + allowUnsafeEnchants = getBoolean("settings.enchantment.anvil.allow-unsafe-enchants", allowUnsafeEnchants); + allowInapplicableEnchants = getBoolean("settings.enchantment.anvil.allow-inapplicable-enchants", allowInapplicableEnchants); + allowIncompatibleEnchants = getBoolean("settings.enchantment.anvil.allow-incompatible-enchants", allowIncompatibleEnchants);