OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 15:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add hand to fish event for all player interactions

Browse source
This commit is contained in:
booky10 2023-07-03 01:55:32 +02:00
parent cb16d3df2c
commit ffa5164e4c
2 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
paper-server/patches/sources/net/minecraft/world/entity/projectile/FishingHook.java.patch
View file

@ -22,10 +22,11 @@
public class FishingHook extends Projectile {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -68,6 +74,18 @@
@@ -67,6 +73,18 @@
public FishingHook.FishHookState currentState;
private final int luck;
private final int lureSpeed;
+
+ // CraftBukkit start - Extra variables to enable modification of fishing wait time, values are minecraft defaults
+ public int minWaitTime = 100;
+ public int maxWaitTime = 600;
@ -37,10 +38,9 @@
+ public boolean rainInfluenced = true;
+ public boolean skyInfluenced = true;
+ // CraftBukkit end
+
private FishingHook(EntityType<? extends FishingHook> type, Level world, int luckBonus, int waitTimeReductionTicks) {
super(type, world);
this.syncronizedRandom = RandomSource.create();
@@ -75,13 +93,17 @@
this.currentState = FishingHook.FishHookState.FLYING;
this.luck = Math.max(0, luckBonus);
@ -175,19 +175,28 @@
public boolean calculateOpenWater(BlockPos pos) {
FishingHook.OpenWaterType entityfishinghook_waterposition = FishingHook.OpenWaterType.INVALID;
@@ -446,12 +488,20 @@
@@ -445,13 +487,29 @@
@Override
public void readAdditionalSaveData(CompoundTag nbt) {}
+ // Paper start - Add hand parameter to PlayerFishEvent
+ @Deprecated
+ @io.papermc.paper.annotation.DoNotUse
public int retrieve(ItemStack usedItem) {
- Player entityhuman = this.getPlayerOwner();
+ net.minecraft.world.entity.player.Player entityhuman = this.getPlayerOwner();
+ return this.retrieve(net.minecraft.world.InteractionHand.MAIN_HAND, usedItem);
+ }
+ public int retrieve(net.minecraft.world.InteractionHand hand, ItemStack usedItem) {
+ // Paper end - Add hand parameter to PlayerFishEvent
+ net.minecraft.world.entity.player.Player entityhuman = this.getPlayerOwner();
+
if (!this.level().isClientSide && entityhuman != null && !this.shouldStopFishing(entityhuman)) {
int i = 0;
if (this.hookedIn != null) {
+ // CraftBukkit start
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), this.hookedIn.getBukkitEntity(), (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.CAUGHT_ENTITY);
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), this.hookedIn.getBukkitEntity(), (FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), PlayerFishEvent.State.CAUGHT_ENTITY); // Paper - Add hand parameter to PlayerFishEvent
+ this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+
+ if (playerFishEvent.isCancelled()) {
@ -197,7 +206,7 @@
this.pullEntity(this.hookedIn);
CriteriaTriggers.FISHING_ROD_HOOKED.trigger((ServerPlayer) entityhuman, usedItem, this, Collections.emptyList());
this.level().broadcastEntityEvent(this, (byte) 31);
@@ -466,15 +516,38 @@
@@ -466,15 +524,38 @@
while (iterator.hasNext()) {
ItemStack itemstack1 = (ItemStack) iterator.next();
@ -210,7 +219,7 @@
+ }
+ // Paper end
+ // CraftBukkit start
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), entityitem != null ? entityitem.getBukkitEntity() : null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.CAUGHT_FISH); // Paper - entityitem may be null
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), entityitem != null ? entityitem.getBukkitEntity() : null, (FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), PlayerFishEvent.State.CAUGHT_FISH); // Paper - entityitem may be null // Paper - Add hand parameter to PlayerFishEvent
+ playerFishEvent.setExpToDrop(this.random.nextInt(6) + 1);
+ this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+
@ -240,12 +249,12 @@
if (itemstack1.is(ItemTags.FISHES)) {
entityhuman.awardStat(Stats.FISH_CAUGHT, 1);
}
@@ -484,10 +557,27 @@
@@ -484,10 +565,27 @@
}
if (this.onGround()) {
+ // CraftBukkit start
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.IN_GROUND);
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), PlayerFishEvent.State.IN_GROUND); // Paper - Add hand parameter to PlayerFishEvent
+ this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+
+ if (playerFishEvent.isCancelled()) {
@ -256,7 +265,7 @@
}
+ // CraftBukkit start
+ if (i == 0) {
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.REEL_IN);
+ PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), PlayerFishEvent.State.REEL_IN); // Paper - Add hand parameter to PlayerFishEvent
+ this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+ if (playerFishEvent.isCancelled()) {
+ return 0;
@ -269,7 +278,7 @@
return i;
} else {
return 0;
@@ -496,7 +586,7 @@
@@ -496,7 +594,7 @@
@Override
public void handleEntityEvent(byte status) {
@ -278,7 +287,7 @@
this.pullEntity(this.hookedIn);
}
@@ -520,8 +610,15 @@
@@ -520,8 +618,15 @@
@Override
public void remove(Entity.RemovalReason reason) {
@ -295,7 +304,7 @@
}
@Override
@@ -536,7 +633,7 @@
@@ -536,7 +641,7 @@
}
private void updateOwnerInfo(@Nullable FishingHook fishingBobber) {
@ -304,7 +313,7 @@
if (entityhuman != null) {
entityhuman.fishing = fishingBobber;
@@ -545,10 +642,10 @@
@@ -545,10 +650,10 @@
}
@Nullable
@ -317,7 +326,7 @@
}
@Nullable
@@ -575,7 +672,7 @@
@@ -575,7 +680,7 @@
int i = packet.getData();
FishingHook.LOGGER.error("Failed to recreate fishing hook on client. {} (id: {}) is not a valid owner.", this.level().getEntity(i), i);

9
paper-server/patches/sources/net/minecraft/world/item/FishingRodItem.java.patch
View file

@ -12,6 +12,15 @@
public class FishingRodItem extends Item {
public FishingRodItem(Item.Properties settings) {
@@ -26,7 +31,7 @@
if (user.fishing != null) {
if (!world.isClientSide) {
- int i = user.fishing.retrieve(itemstack);
+ int i = user.fishing.retrieve(hand, itemstack); // Paper - Add hand parameter to PlayerFishEvent
itemstack.hurtAndBreak(i, user, LivingEntity.getSlotForHand(hand));
}
@@ -34,13 +39,24 @@
world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.FISHING_BOBBER_RETRIEVE, SoundSource.NEUTRAL, 1.0F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
user.gameEvent(GameEvent.ITEM_INTERACT_FINISH);