core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0455-Add-PlayerAttackEntity...

29 lines
1.9 KiB
Diff
Raw Normal View History

Rebuild all patches using the new rebuild pattern
2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
Add PlayerAttackEntityCooldownResetEvent This event is called when processing a player's attack on an entity right before their attack strength cd is reset, there are no existing events that fire within this period of time so it was impossible to capture the players attack strength via API prior to this commit. The event is cancellable, which will just skip over the normal reset of attack strength cd
2020-03-27 03:04:19 +00:00
From: nossr50 <nossr50@gmail.com>
Date: Thu, 26 Mar 2020 19:44:50 -0700
Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 220bc594 #486: Add method to get player's attack cooldown 21853d39 SPIGOT-5681: Increase max plugin channel size 5b972adc Improve build process b55e58d9 Note which custom generator is missing required method CraftBukkit Changes: 893ad93b #650: Add method to get player's attack cooldown ef706b06 #655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender. e0cfb347 SPIGOT-5689: Fireball.setDirection increases velocity too much 94cb030f SPIGOT-5673: swingHand API does not show to self b331a055 SPIGOT-5680: isChunkGenerated creates empty region files e1335932 Improve build process a8ec1d60 Add a couple of method null checks to CraftWorld ce66f693 Misc checkstyle fixes 8bd0e9ab SPIGOT-5669: Fix Beehive.isSedated Spigot Changes: 2040c4c4 SPIGOT-5677, MC-114796: Fix portals generating outside world border ab8f6b5a Rebuild patches e7dc2f53 Rebuild patches
2020-04-27 07:34:45 +00:00
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 08de4679f #789: Call EntityDropItemEvent when a wither rose is dropped
2021-01-28 23:32:05 +00:00
index 976e66ca81fe13b6bfede4da46bd45f0274de57f..29baae49888f030d136e99c44a5a55494606e471 100644
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 220bc594 #486: Add method to get player's attack cooldown 21853d39 SPIGOT-5681: Increase max plugin channel size 5b972adc Improve build process b55e58d9 Note which custom generator is missing required method CraftBukkit Changes: 893ad93b #650: Add method to get player's attack cooldown ef706b06 #655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender. e0cfb347 SPIGOT-5689: Fireball.setDirection increases velocity too much 94cb030f SPIGOT-5673: swingHand API does not show to self b331a055 SPIGOT-5680: isChunkGenerated creates empty region files e1335932 Improve build process a8ec1d60 Add a couple of method null checks to CraftWorld ce66f693 Misc checkstyle fixes 8bd0e9ab SPIGOT-5669: Fix Beehive.isSedated Spigot Changes: 2040c4c4 SPIGOT-5677, MC-114796: Fix portals generating outside world border ab8f6b5a Rebuild patches e7dc2f53 Rebuild patches
2020-04-27 07:34:45 +00:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 08de4679f #789: Call EntityDropItemEvent when a wither rose is dropped
2021-01-28 23:32:05 +00:00
@@ -1837,7 +1837,16 @@ public abstract class EntityLiving extends Entity {
Add PlayerAttackEntityCooldownResetEvent This event is called when processing a player's attack on an entity right before their attack strength cd is reset, there are no existing events that fire within this period of time so it was impossible to capture the players attack strength via API prior to this commit. The event is cancellable, which will just skip over the normal reset of attack strength cd
2020-03-27 03:04:19 +00:00
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 220bc594 #486: Add method to get player's attack cooldown 21853d39 SPIGOT-5681: Increase max plugin channel size 5b972adc Improve build process b55e58d9 Note which custom generator is missing required method CraftBukkit Changes: 893ad93b #650: Add method to get player's attack cooldown ef706b06 #655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender. e0cfb347 SPIGOT-5689: Fireball.setDirection increases velocity too much 94cb030f SPIGOT-5673: swingHand API does not show to self b331a055 SPIGOT-5680: isChunkGenerated creates empty region files e1335932 Improve build process a8ec1d60 Add a couple of method null checks to CraftWorld ce66f693 Misc checkstyle fixes 8bd0e9ab SPIGOT-5669: Fix Beehive.isSedated Spigot Changes: 2040c4c4 SPIGOT-5677, MC-114796: Fix portals generating outside world border ab8f6b5a Rebuild patches e7dc2f53 Rebuild patches
2020-04-27 07:34:45 +00:00
EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption);
if (damagesource.getEntity() instanceof EntityHuman) {
even even even even even even more work
2020-06-26 01:53:21 +00:00
- ((EntityHuman) damagesource.getEntity()).resetAttackCooldown(); // Moved from EntityHuman in order to make the cooldown reset get called after the damage event is fired
Add PlayerAttackEntityCooldownResetEvent This event is called when processing a player's attack on an entity right before their attack strength cd is reset, there are no existing events that fire within this period of time so it was impossible to capture the players attack strength via API prior to this commit. The event is cancellable, which will just skip over the normal reset of attack strength cd
2020-03-27 03:04:19 +00:00
+ // Paper start - PlayerAttackEntityCooldownResetEvent
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 220bc594 #486: Add method to get player's attack cooldown 21853d39 SPIGOT-5681: Increase max plugin channel size 5b972adc Improve build process b55e58d9 Note which custom generator is missing required method CraftBukkit Changes: 893ad93b #650: Add method to get player's attack cooldown ef706b06 #655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender. e0cfb347 SPIGOT-5689: Fireball.setDirection increases velocity too much 94cb030f SPIGOT-5673: swingHand API does not show to self b331a055 SPIGOT-5680: isChunkGenerated creates empty region files e1335932 Improve build process a8ec1d60 Add a couple of method null checks to CraftWorld ce66f693 Misc checkstyle fixes 8bd0e9ab SPIGOT-5669: Fix Beehive.isSedated Spigot Changes: 2040c4c4 SPIGOT-5677, MC-114796: Fix portals generating outside world border ab8f6b5a Rebuild patches e7dc2f53 Rebuild patches
2020-04-27 07:34:45 +00:00
+ if (damagesource.getEntity() instanceof EntityPlayer) {
+ EntityPlayer player = (EntityPlayer) damagesource.getEntity();
Clean up a lot of obfuscation helpers and impls This fixes a bug with obfuscation helpers for attack cooldown But every other change should stay the same. Cleaning up a lot of helpers that pointed to already unobfuscated items. Also adds final to many of the obfhelpers to assist with inlining. This is pretty much a patch maintenance
2020-08-02 05:39:36 +00:00
+ if (new com.destroystokyo.paper.event.player.PlayerAttackEntityCooldownResetEvent(player.getBukkitEntity(), this.getBukkitEntity(), player.getAttackCooldown(0F)).callEvent()) {
+ player.resetAttackCooldown();
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 220bc594 #486: Add method to get player's attack cooldown 21853d39 SPIGOT-5681: Increase max plugin channel size 5b972adc Improve build process b55e58d9 Note which custom generator is missing required method CraftBukkit Changes: 893ad93b #650: Add method to get player's attack cooldown ef706b06 #655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender. e0cfb347 SPIGOT-5689: Fireball.setDirection increases velocity too much 94cb030f SPIGOT-5673: swingHand API does not show to self b331a055 SPIGOT-5680: isChunkGenerated creates empty region files e1335932 Improve build process a8ec1d60 Add a couple of method null checks to CraftWorld ce66f693 Misc checkstyle fixes 8bd0e9ab SPIGOT-5669: Fix Beehive.isSedated Spigot Changes: 2040c4c4 SPIGOT-5677, MC-114796: Fix portals generating outside world border ab8f6b5a Rebuild patches e7dc2f53 Rebuild patches
2020-04-27 07:34:45 +00:00
+ }
+ } else {
Clean up a lot of obfuscation helpers and impls This fixes a bug with obfuscation helpers for attack cooldown But every other change should stay the same. Cleaning up a lot of helpers that pointed to already unobfuscated items. Also adds final to many of the obfhelpers to assist with inlining. This is pretty much a patch maintenance
2020-08-02 05:39:36 +00:00
+ ((EntityHuman) damagesource.getEntity()).resetAttackCooldown();
Add PlayerAttackEntityCooldownResetEvent This event is called when processing a player's attack on an entity right before their attack strength cd is reset, there are no existing events that fire within this period of time so it was impossible to capture the players attack strength via API prior to this commit. The event is cancellable, which will just skip over the normal reset of attack strength cd
2020-03-27 03:04:19 +00:00
+ }
+ // Paper end
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 220bc594 #486: Add method to get player's attack cooldown 21853d39 SPIGOT-5681: Increase max plugin channel size 5b972adc Improve build process b55e58d9 Note which custom generator is missing required method CraftBukkit Changes: 893ad93b #650: Add method to get player's attack cooldown ef706b06 #655: Added support for the VM tag jansi.passthrough when processing messages sent to a ColouredConsoleSender. e0cfb347 SPIGOT-5689: Fireball.setDirection increases velocity too much 94cb030f SPIGOT-5673: swingHand API does not show to self b331a055 SPIGOT-5680: isChunkGenerated creates empty region files e1335932 Improve build process a8ec1d60 Add a couple of method null checks to CraftWorld ce66f693 Misc checkstyle fixes 8bd0e9ab SPIGOT-5669: Fix Beehive.isSedated Spigot Changes: 2040c4c4 SPIGOT-5677, MC-114796: Fix portals generating outside world border ab8f6b5a Rebuild patches e7dc2f53 Rebuild patches
2020-04-27 07:34:45 +00:00
}
if (event.isCancelled()) {
return false;