diff --git a/patches/server/0004-Configurable-entity-base-attributes.patch b/patches/server/0004-Configurable-entity-base-attributes.patch index a08432f16..380a6e489 100644 --- a/patches/server/0004-Configurable-entity-base-attributes.patch +++ b/patches/server/0004-Configurable-entity-base-attributes.patch @@ -4,6 +4,19 @@ Date: Thu, 10 Dec 2020 16:44:54 -0600 Subject: [PATCH] Configurable entity base attributes +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index f98f9e295a8e76a95e2afd24b1469a354fe614c5..c5a3f54a590d164ec0f7794f6745ea86753a30d3 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -150,7 +150,7 @@ import org.bukkit.plugin.PluginManager; + // CraftBukkit end + + public abstract class Entity implements Nameable, EntityAccess, CommandSource, net.minecraft.server.KeyedObject { // Paper +- ++ protected static javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino"); // Purpur + // CraftBukkit start + private static final int CURRENT_LEVEL = 2; + public boolean preserveMotion = true; // Paper - keep initial motion on first setPositionRotation diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java index 8f8bc29d847801938e251904b8334b4b31bd21c5..87d01bebbb179eec53323e9e23db011a791660ed 100644 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java @@ -1086,18 +1099,10 @@ index dca18730731407bb68ad32852c7994062b0b4ba6..070e1ef31d4dabb943fc57ea4f46bb8d @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java -index 25ce1910a03947ce070b318f57379f0da5ac5db8..95fd7e0ef552c606eaa75a0e23c0fcbb6d714a72 100644 +index 25ce1910a03947ce070b318f57379f0da5ac5db8..7a9654a365a968592d706a13fb46615effcc2399 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java -@@ -61,6 +61,7 @@ import org.bukkit.event.entity.SlimeSplitEvent; - public class Slime extends Mob implements Enemy { - - private static final EntityDataAccessor ID_SIZE = SynchedEntityData.defineId(Slime.class, EntityDataSerializers.INT); -+ private static javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino"); // Purpur - public static final int MIN_SIZE = 1; - public static final int MAX_SIZE = 127; - public float targetSquish; -@@ -101,6 +102,30 @@ public class Slime extends Mob implements Enemy { +@@ -101,6 +101,30 @@ public class Slime extends Mob implements Enemy { } return true; // do not jump() in wasd controller, let vanilla controller handle } @@ -1128,7 +1133,7 @@ index 25ce1910a03947ce070b318f57379f0da5ac5db8..95fd7e0ef552c606eaa75a0e23c0fcbb // Purpur end @Override -@@ -129,7 +154,7 @@ public class Slime extends Mob implements Enemy { +@@ -129,7 +153,7 @@ public class Slime extends Mob implements Enemy { this.entityData.set(Slime.ID_SIZE, j); this.reapplyPosition(); this.refreshDimensions(); diff --git a/patches/server/0063-Add-player-death-exp-control-options.patch b/patches/server/0063-Add-player-death-exp-control-options.patch index f549ac040..a151d3260 100644 --- a/patches/server/0063-Add-player-death-exp-control-options.patch +++ b/patches/server/0063-Add-player-death-exp-control-options.patch @@ -5,19 +5,10 @@ Subject: [PATCH] Add player death exp control options 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 e0544699714fd4c6ef2deb17f49b8246a7021463..3dc2ebc102fe3f575eede672509f330271571575 100644 +index e0544699714fd4c6ef2deb17f49b8246a7021463..831a62e56c745884f34fb5d8f84f037543d77d1d 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,8 @@ public abstract class Player extends LivingEntity { - // CraftBukkit end - - // Purpur start -+ private javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino"); -+ - public abstract void resetLastActionTime(); - - public void setAfk(boolean afk) { -@@ -1909,9 +1911,18 @@ public abstract class Player extends LivingEntity { +@@ -1909,9 +1909,18 @@ public abstract class Player extends LivingEntity { @Override protected int getExperienceReward(Player player) { if (!this.level.getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) { diff --git a/patches/server/0124-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0124-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch index aed814b87..0a21511c0 100644 --- a/patches/server/0124-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch +++ b/patches/server/0124-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent 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 3dc2ebc102fe3f575eede672509f330271571575..e15155c01b94d2f52182d28bebf2b5db65acdb97 100644 +index 831a62e56c745884f34fb5d8f84f037543d77d1d..d4e6c16b08c5aaf9c50467941498b566f11cc5d2 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -182,6 +182,7 @@ public abstract class Player extends LivingEntity { @@ -16,7 +16,7 @@ index 3dc2ebc102fe3f575eede672509f330271571575..e15155c01b94d2f52182d28bebf2b5db // CraftBukkit start public boolean fauxSleeping; -@@ -1247,6 +1248,7 @@ public abstract class Player extends LivingEntity { +@@ -1245,6 +1246,7 @@ public abstract class Player extends LivingEntity { flag2 = flag2 && !level.paperConfig.disablePlayerCrits; // Paper flag2 = flag2 && !this.isSprinting(); if (flag2) { @@ -24,7 +24,7 @@ index 3dc2ebc102fe3f575eede672509f330271571575..e15155c01b94d2f52182d28bebf2b5db f *= 1.5F; } -@@ -1283,6 +1285,7 @@ public abstract class Player extends LivingEntity { +@@ -1281,6 +1283,7 @@ public abstract class Player extends LivingEntity { Vec3 vec3d = target.getDeltaMovement(); boolean flag5 = target.hurt(DamageSource.playerAttack(this), f); diff --git a/patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch index 9de516807..17f52bc00 100644 --- a/patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/server/0144-Full-netherite-armor-grants-fire-resistance.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Full netherite armor grants fire resistance 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 e15155c01b94d2f52182d28bebf2b5db65acdb97..1109abd6ba6eeac9b81d23816efd731950b9d0eb 100644 +index d4e6c16b08c5aaf9c50467941498b566f11cc5d2..f4f49b87b615a3c7ef56247896392de93eb1bb0d 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -362,6 +362,16 @@ public abstract class Player extends LivingEntity { +@@ -360,6 +360,16 @@ public abstract class Player extends LivingEntity { this.addEffect(new MobEffectInstance(MobEffects.WATER_BREATHING, 200, 0, false, false, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.TURTLE_HELMET); // CraftBukkit } diff --git a/patches/server/0198-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0198-Add-config-change-multiplier-critical-damage-value.patch index 9d72a160f..9dd5a3a61 100644 --- a/patches/server/0198-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0198-Add-config-change-multiplier-critical-damage-value.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add config change multiplier critical damage value 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 1109abd6ba6eeac9b81d23816efd731950b9d0eb..77febfcd29562f1a8558e6a9306ccdfdecd11897 100644 +index f4f49b87b615a3c7ef56247896392de93eb1bb0d..dfe78217add616c761ba53fb4999cc6593863d2d 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1259,7 +1259,7 @@ public abstract class Player extends LivingEntity { +@@ -1257,7 +1257,7 @@ public abstract class Player extends LivingEntity { flag2 = flag2 && !this.isSprinting(); if (flag2) { this.isCritical = true; // Purpur diff --git a/patches/server/0205-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0205-Fix-advancement-triggers-on-entity-death.patch index f90d1195c..973e7de52 100644 --- a/patches/server/0205-Fix-advancement-triggers-on-entity-death.patch +++ b/patches/server/0205-Fix-advancement-triggers-on-entity-death.patch @@ -139,10 +139,10 @@ index c9a44a4765f43b9c0247ed1005f4c13469bdee95..6d08c8c31a32ea38f06410fbaddf19b9 public boolean canTakeItem(ItemStack stack) { net.minecraft.world.entity.EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack); 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 77febfcd29562f1a8558e6a9306ccdfdecd11897..7f0ca07121bccf6faf9c8ebfe97e253775443f8b 100644 +index dfe78217add616c761ba53fb4999cc6593863d2d..b9ce1021f12f14ba45c49890d8d529b733bae532 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1995,6 +1995,52 @@ public abstract class Player extends LivingEntity { +@@ -1993,6 +1993,52 @@ public abstract class Player extends LivingEntity { } diff --git a/patches/server/0210-Flying-Fall-Damage-API.patch b/patches/server/0210-Flying-Fall-Damage-API.patch index 40ae10530..a6b97ba1e 100644 --- a/patches/server/0210-Flying-Fall-Damage-API.patch +++ b/patches/server/0210-Flying-Fall-Damage-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API 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 7f0ca07121bccf6faf9c8ebfe97e253775443f8b..64b6c359c895264baa55d959ce28929712e8b1ee 100644 +index b9ce1021f12f14ba45c49890d8d529b733bae532..48e208c332a06c56fef604920a1cb95cbe743efc 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity { @@ -16,7 +16,7 @@ index 7f0ca07121bccf6faf9c8ebfe97e253775443f8b..64b6c359c895264baa55d959ce289297 // CraftBukkit start public boolean fauxSleeping; -@@ -1734,7 +1735,7 @@ public abstract class Player extends LivingEntity { +@@ -1732,7 +1733,7 @@ public abstract class Player extends LivingEntity { @Override public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) { diff --git a/patches/server/0212-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0212-Burp-after-eating-food-fills-hunger-bar-completely.patch index ad35f0d46..4003b75e4 100644 --- a/patches/server/0212-Burp-after-eating-food-fills-hunger-bar-completely.patch +++ b/patches/server/0212-Burp-after-eating-food-fills-hunger-bar-completely.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Burp after eating food fills hunger bar completely 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 64b6c359c895264baa55d959ce28929712e8b1ee..5782bf409e98305ec3448f2a73663352294a4897 100644 +index 48e208c332a06c56fef604920a1cb95cbe743efc..34e6be36d1304e072bd742a61105757f8e6b0a62 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -196,6 +196,8 @@ public abstract class Player extends LivingEntity { @@ -14,10 +14,10 @@ index 64b6c359c895264baa55d959ce28929712e8b1ee..5782bf409e98305ec3448f2a73663352 // Purpur start + public int burpCooldown = 0; + - private javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino"); - public abstract void resetLastActionTime(); -@@ -260,6 +262,12 @@ public abstract class Player extends LivingEntity { + + public void setAfk(boolean afk) { +@@ -258,6 +260,12 @@ public abstract class Player extends LivingEntity { @Override public void tick() { @@ -30,7 +30,7 @@ index 64b6c359c895264baa55d959ce28929712e8b1ee..5782bf409e98305ec3448f2a73663352 this.noPhysics = this.isSpectator(); if (this.isSpectator()) { this.onGround = false; -@@ -2349,7 +2357,7 @@ public abstract class Player extends LivingEntity { +@@ -2347,7 +2355,7 @@ public abstract class Player extends LivingEntity { public ItemStack eat(Level world, ItemStack stack) { this.getFoodData().eat(stack.getItem(), stack); this.awardStat(Stats.ITEM_USED.get(stack.getItem()));