mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@46c6f49 Fix Registry#getKey implementation PaperMC/Paper@4c6ea84 move junit platform dep to -server and -api PaperMC/Paper@c31d95e remove test plugin diff accidentally committed PaperMC/Paper@90d50aa update .editorconfig PaperMC/Paper@8ad15d6 Update minecraft dir references PaperMC/Paper@083c083 Fix a bunch more issues arising from mutable types (#11769) PaperMC/Paper@eb793c3 [ci skip] more cleanup from repo reorg PaperMC/Paper@f8bf600 Fix potion effect type removal (#11778) PaperMC/Paper@188124b Fix totems negating incorrect item (#11776) PaperMC/Paper@a0b3326 refactor registry entry to detach 'delayed' from other meta PaperMC/Paper@cbf630d Move missing import into feature patches to fix pre-features compile PaperMC/Paper@17f649d Fix PlayerTradeEvent visual issue when being cancelled (#11773) PaperMC/Paper@976b0a4 [ci skip] Simplify and update contribution guidelines PaperMC/Paper@63c94c9 [ci skip] Comment out update tasks, update comments PaperMC/Paper@62d4130 [ci skip] Fix Inventory#addItem javadoc mismatch with behaviour (#11782) PaperMC/Paper@bd4c235 Throw during plugin update folder process on failed rename/delete (#11784) PaperMC/Paper@793d361 Fix recipe book items order (#11787) PaperMC/Paper@c768099 Fix tripwires (#11790) PaperMC/Paper@17d76ae Correctly die when cancelling EntityResurrectEvent (#11785) PaperMC/Paper@aa2c52b Fix dropper inventory var PaperMC/Paper@d0d0efe Partially revert 083c083188 for Transformation (#11798) PaperMC/Paper@b8a0541 Fix 0 parameter in Player#applyMending (#11802) PaperMC/Paper@9e2d39c Fix double chest identification (#11812) PaperMC/Paper@321d17c [ci skip] Only build PRs on correct label (#11811) PaperMC/Paper@d568e17 Port basic lookAt methods from Player to Entity (#11775) PaperMC/Paper@25cc3d8 Fix EnchantmentView#setOffers length precondition being flipped (#11818) PaperMC/Paper@763b32d Fix framed maps looping through all players in world (#11819) PaperMC/Paper@946314f Remove disableTeleportationSuffocationCheck config (#11822) PaperMC/Paper@140577b Fix broken field rename compat for instrument "feel_goat_horn" (#11824) PaperMC/Paper@a07cec1 Add effective name to ItemStack (#11770) PaperMC/Paper@3a479ea Add Registry#getTags (#11795) PaperMC/Paper@d85d318 Fix NullPointerException in PlayerInteractEvent#getClickedPosition (#11827) PaperMC/Paper@3331805 Deprecate #furnace_materials item tag (#11823) PaperMC/Paper@c9a904e Fix keepalive logic resetting counter PaperMC/Paper@a8f850a temporarily revert OldEnum toString changes (#11829) PaperMC/Paper@a14c06b fix annotation test for null marked inner classes (#11826) PaperMC/Paper@f51aa3e Fix BlockRedstoneEvent for tripwire hooks (#11791) PaperMC/Paper@af2812f For new registry values, allow copying from existing (#11796) PaperMC/Paper@0efd301 Fix suggestions for ResourceLocation (#11830) PaperMC/Paper@aac246a Expand on entity serialization API (#11807) PaperMC/Paper@953f6f9 Banner pattern registry modification (#11803) PaperMC/Paper@a5b8df6 add tagkey file for entity type (#11832) PaperMC/Paper@c530c39 More var name fixes PaperMC/Paper@2b73d19 More var name fixes PaperMC/Paper@326c687 Fix whack diff from last commit PaperMC/Paper@13c94e4 Updated adventure to 4.18.0 (#11809) PaperMC/Paper@ca8709b Fix more incorrect array nullability annotations (#11836) PaperMC/Paper@e10dcbf [ci skip] Improve build workflow conditions (#11842) PaperMC/Paper@b4051db Handle disabled vanilla registry values correctly (#11781) PaperMC/Paper@4b89390 Fix contextual map renderer memory leak (#11841) PaperMC/Paper@5c7537c Add DamageType RegistryEvent (#11783) PaperMC/Paper@33411ec Properly remove UnsafeValues#getDamageEffect PaperMC/Paper@0629524 Directly build Art (#11813) PaperMC/Paper@e0abc5f Do not spawn fire for visual lightning (#11845) PaperMC/Paper@dac977a Correctly force particles (#11850) PaperMC/Paper@feb8756 Add datapack registration lifecycle event (#11804) PaperMC/Paper@18da1ae [ci skip] update DiscoveredDatapack javadoc PaperMC/Paper@93a3df0 Extend HumanEntity#dropItem API (#11810) PaperMC/Paper@287eb52 Use hidden classes for event executors (#11848) PaperMC/Paper@887f3f7 [ci skip] Replace FQN with import in EventExecutor PaperMC/Paper@d00344a update jb annotations to 26.0.1 (#11860) PaperMC/Paper@60edd61 [ci skip] Fix spelling of ignition's word into javadoc (#11864) PaperMC/Paper@a81990e Update mache, fixes dev bundle use with Java 23 PaperMC/Paper@1e4669e [ci skip] Clarify loot table behavior when set to null. (#11861) PaperMC/Paper@9298f59 Update paperweight to 2.0.0-beta.10 PaperMC/Paper@bdfad1c Add sendRich/PlainMessage methods to Server (#11872) PaperMC/Paper@1dd52be Use playerlist whitelist status instead of properties PaperMC/Paper@83995d7 Fix settings changes not being saved (#11881) PaperMC/Paper@daddcf6 Fix JOML javadoc URL (#11883) PaperMC/Paper@edde726 [ci skip] Add missing Nullable annotations for NMS DamageSource (#11875) PaperMC/Paper@4106da7 Fix retain passengers teleport flag (#11858) PaperMC/Paper@6ab1352 Improve performance of PoiCompetitorScan by unrolling stream (#11871) PaperMC/Paper@33a590b Fix TargetHitEvent#getSignalStrength() post-hard-fork (#11897) PaperMC/Paper@f367f10 Add rotation helpers to Location (#11908) PaperMC/Paper@9f90b4c Fix ItemDamageEvents called for 0 damage (#11900) PaperMC/Paper@486e521 Re-add droped MapLike spam fix (#11917) PaperMC/Paper@3375570 Fix MapCanvas#drawImage (#11865) PaperMC/Paper@49d15f6 Fix DiscoveredDatapack#getSource (#11928) PaperMC/Paper@b34ae4f Fix wolves ignoring result of damage event (#11932) PaperMC/Paper@efdcaa2 Fix removing the "LootTable" nbt tag from Block entities (#11929) PaperMC/Paper@55f3f28 Reimplement ItemStack Obfuscation (#11817) PaperMC/Paper@08fc33c Update CustomTimingsHandler Nag Message (#11923) PaperMC/Paper@5e14504 [ci skip] Add missing deprecated docs for isEnabledByFeature (#11938) PaperMC/Paper@4007171 Correct obfuscation of oversized items (#11944) PaperMC/Paper@1b38f28 Fix reading recipes used on furnace (#11947) PaperMC/Paper@b03d39b [ci skip] Update paperweight to 2.0.0-beta.13 PaperMC/Paper@6316a50 Make CraftServer#isPrimaryThread use TickThread check PaperMC/Paper@ea7b961 Fix MapItem incorectly fetching water biomes on treasure maps (#11936) PaperMC/Paper@b242f1e Prevent day cycle on the client when using fixed time (#11924) PaperMC/Paper@3e42518 Fix snow accumulating in custom biomes without precipitation (#11854) PaperMC/Paper@3d9ecc4 Log thread check parameters when the thread check fails PaperMC/Paper@3ad3fbc Update to Concurrentutil 0.0.3 PaperMC/Paper@79ffcd1 Fix vanilla parity on enchantable items with no targets (#11896) PaperMC/Paper@19ddbef Fix InventoryAction wrong for Bundles (#11902) PaperMC/Paper@ac3aaa2 Don't use delayed registries in impl anywhere (#11918) PaperMC/Paper@775002a [ci skip] Remove nullable from SyncedEntityData#packAll (#11949) PaperMC/Paper@c949225 MenuType API addition InventoryView Builders (#11816) PaperMC/Paper@c2f24e1 Feat: Add 'with' methods to CommandSourceStack (#11868) PaperMC/Paper@ed75b0e Disallow calling JavaPlugin#getCommand during onEnable for Paper plugins (#11914) PaperMC/Paper@08ac057 Rename getPotentialBedLocation to getPotentialRespawnLocation (#11950) PaperMC/Paper@9746d73 Add back known movement check PaperMC/Paper@e5542cf Hide unnecessary decorated pot data (#11957) PaperMC/Paper@eb4db79 Make CommandSourceStack respect hidden players (#11898) PaperMC/Paper@76617dd Add EntityEffectTickEvent (#11838) PaperMC/Paper@86c6308 Fix locate command dist overflow/underflow (#11956) PaperMC/Paper@2ea6aee Deprecate Turtle#isDigging (#11959) PaperMC/Paper@ad74b67 Fix client visual desync if cooldown events are cancelled (#11892) PaperMC/Paper@50c2c59 Fix unstable Suggestion comparison by sorting int suggestions before text ones (#11941) PaperMC/Paper@3709150 Expose all possible block data states (#11958) PaperMC/Paper@5e23d28 Remove entity tag selector tag completion fix (#11964) PaperMC/Paper@ab1b312 Call PlayerItemDamageEvent for tridents (#11899) PaperMC/Paper@1bb3677 Remove deprecation from EntityRemoveEvent (#11961) PaperMC/Paper@d69981b [ci skip] Remove redundant build configuration PaperMC/Paper@6fde26d remove .paperassetsroot PaperMC/Paper@fe75eaf split direct holder support up from ctor accepting Holder
97 lines
6.3 KiB
Diff
97 lines
6.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Thu, 25 Jul 2019 18:07:37 -0500
|
|
Subject: [PATCH] Implement elytra settings
|
|
|
|
|
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
|
index d1f7da0f4adc4609247c349d7ccdb0e6bba9b8f8..6de5f527c018201d874e06a45c9509fa12125766 100644
|
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3595,7 +3595,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
if (i1 % 2 == 0) {
|
|
List<EquipmentSlot> list = EquipmentSlot.VALUES.stream().filter(slot -> canGlideUsing(this.getItemBySlot(slot), slot)).toList();
|
|
EquipmentSlot equipmentSlot = Util.getRandom(list, this.random);
|
|
- this.getItemBySlot(equipmentSlot).hurtAndBreak(1, this, equipmentSlot);
|
|
+
|
|
+ // Purpur start - Implement elytra settings
|
|
+ int damage = level().purpurConfig.elytraDamagePerSecond;
|
|
+ if (level().purpurConfig.elytraDamageMultiplyBySpeed > 0) {
|
|
+ double speed = getDeltaMovement().lengthSqr();
|
|
+ if (speed > level().purpurConfig.elytraDamageMultiplyBySpeed) {
|
|
+ damage *= (int) speed;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ this.getItemBySlot(equipmentSlot).hurtAndBreak(damage, this, equipmentSlot);
|
|
+ // Purpur end - Implement elytra settings
|
|
}
|
|
|
|
this.gameEvent(GameEvent.ELYTRA_GLIDE);
|
|
diff --git a/net/minecraft/world/item/FireworkRocketItem.java b/net/minecraft/world/item/FireworkRocketItem.java
|
|
index 75a9bd205f32b77c5d242cb9fac0f571ce36045a..b03f182c62c699cc222e67c1ae6eadf99c45d48d 100644
|
|
--- a/net/minecraft/world/item/FireworkRocketItem.java
|
|
+++ b/net/minecraft/world/item/FireworkRocketItem.java
|
|
@@ -66,6 +66,19 @@ public class FireworkRocketItem extends Item implements ProjectileItem {
|
|
com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemInHand), (org.bukkit.entity.Firework) delayed.projectile().getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand));
|
|
if (event.callEvent() && delayed.attemptSpawn()) {
|
|
player.awardStat(Stats.ITEM_USED.get(this)); // Moved up from below
|
|
+
|
|
+ // Purpur start - Implement elytra settings
|
|
+ if (level.purpurConfig.elytraDamagePerFireworkBoost > 0) {
|
|
+ List<net.minecraft.world.entity.EquipmentSlot> list = net.minecraft.world.entity.EquipmentSlot.VALUES.stream().filter((enumitemslot) -> net.minecraft.world.entity.LivingEntity.canGlideUsing(player.getItemBySlot(enumitemslot), enumitemslot)).toList();
|
|
+ net.minecraft.world.entity.EquipmentSlot enumitemslot = net.minecraft.Util.getRandom(list, player.random);
|
|
+
|
|
+ ItemStack glideItem = player.getItemBySlot(enumitemslot);
|
|
+ if (player.canGlide()) {
|
|
+ glideItem.hurtAndBreak(level.purpurConfig.elytraDamagePerFireworkBoost, player, enumitemslot);
|
|
+ }
|
|
+ }
|
|
+ // Purpur end - Implement elytra settings
|
|
+
|
|
if (event.shouldConsume() && !player.hasInfiniteMaterials()) {
|
|
itemInHand.shrink(1); // Moved up from below
|
|
} else {
|
|
diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java
|
|
index c5426585f53a3139dc9d188a73e3a7ff4cb2e492..264b713e8b7c3d5f7d8e1facc90a60349f2cf414 100644
|
|
--- a/net/minecraft/world/item/ItemStack.java
|
|
+++ b/net/minecraft/world/item/ItemStack.java
|
|
@@ -733,6 +733,14 @@ public final class ItemStack implements DataComponentHolder {
|
|
org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent(serverPlayer, this); // Paper - Add EntityDamageItemEvent
|
|
}
|
|
// CraftBukkit end
|
|
+
|
|
+ // Purpur start - Implement elytra settings
|
|
+ if (this.has(DataComponents.GLIDER)) {
|
|
+ setDamageValue(this.getMaxDamage() - 1);
|
|
+ return;
|
|
+ }
|
|
+ // Purpur end - Implement elytra settings
|
|
+
|
|
this.shrink(1);
|
|
onBreak.accept(item);
|
|
}
|
|
diff --git a/net/minecraft/world/item/TridentItem.java b/net/minecraft/world/item/TridentItem.java
|
|
index 07f8c7644a112bb1ba283d1eadd8661010e888a4..7ea7db834e7b627a1d7d37ca87cd43eb61408565 100644
|
|
--- a/net/minecraft/world/item/TridentItem.java
|
|
+++ b/net/minecraft/world/item/TridentItem.java
|
|
@@ -133,6 +133,18 @@ public class TridentItem extends Item implements ProjectileItem {
|
|
f1 *= tridentSpinAttackStrength / squareRoot;
|
|
f2 *= tridentSpinAttackStrength / squareRoot;
|
|
org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerRiptideEvent(player, stack, f, f1, f2); // CraftBukkit
|
|
+
|
|
+ // Purpur start - Implement elytra settings
|
|
+ List<EquipmentSlot> list = EquipmentSlot.VALUES.stream().filter((enumitemslot) -> LivingEntity.canGlideUsing(entity.getItemBySlot(enumitemslot), enumitemslot)).toList();
|
|
+ if (!list.isEmpty()) {
|
|
+ EquipmentSlot enumitemslot = net.minecraft.Util.getRandom(list, entity.random);
|
|
+ ItemStack glideItem = entity.getItemBySlot(enumitemslot);
|
|
+ if (glideItem.has(net.minecraft.core.component.DataComponents.GLIDER) && level.purpurConfig.elytraDamagePerTridentBoost > 0) {
|
|
+ glideItem.hurtAndBreak(level.purpurConfig.elytraDamagePerTridentBoost, entity, enumitemslot);
|
|
+ }
|
|
+ }
|
|
+ // Purpur end - Implement elytra settings
|
|
+
|
|
player.push(f, f1, f2);
|
|
player.startAutoSpinAttack(20, 8.0F, stack);
|
|
if (player.onGround()) {
|