2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Toon Schoenmakers <nighteyes1993@gmail.com>
|
|
|
|
|
Date: Fri, 23 Oct 2020 15:01:44 +0200
|
|
|
|
|
Subject: [PATCH] Avoid error bubbling up when item stack is empty in fishing
|
|
|
|
|
loot
|
|
|
|
|
|
|
|
|
|
This can realistically only happen if there's custom loot active on fishing
|
|
|
|
|
which can return 0 items. This would disconnect the player who's fishing.
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
2022-03-30 22:28:38 +02:00
|
|
|
index ce43f33ffd8726d3fb592348ac1b10f37645eb0e..3789a0db398766f0fbc9e5ac5bf4228a0a0dac88 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
2022-03-11 21:13:46 +01:00
|
|
|
@@ -494,9 +494,15 @@ public class FishingHook extends Projectile {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
|
while (iterator.hasNext()) {
|
|
|
|
|
ItemStack itemstack1 = (ItemStack) iterator.next();
|
|
|
|
|
- ItemEntity entityitem = new ItemEntity(this.level, this.getX(), this.getY(), this.getZ(), itemstack1);
|
|
|
|
|
+ // Paper start, new EntityItem would throw if for whatever reason (mostly shitty datapacks) the itemstack1 turns out to be empty
|
|
|
|
|
+ // if the item stack is empty we instead just have our entityitem as null
|
|
|
|
|
+ ItemEntity entityitem = null;
|
|
|
|
|
+ if (!itemstack1.isEmpty()) {
|
|
|
|
|
+ entityitem = new ItemEntity(this.level, this.getX(), this.getY(), this.getZ(), itemstack1);
|
|
|
|
|
+ }
|
|
|
|
|
+ // Paper end
|
|
|
|
|
// CraftBukkit start
|
|
|
|
|
- PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), entityitem.getBukkitEntity(), (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.CAUGHT_FISH);
|
|
|
|
|
+ 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.setExpToDrop(this.random.nextInt(6) + 1);
|
|
|
|
|
this.level.getCraftServer().getPluginManager().callEvent(playerFishEvent);
|
|
|
|
|
|
2022-03-11 21:13:46 +01:00
|
|
|
@@ -509,8 +515,12 @@ public class FishingHook extends Projectile {
|
2021-06-11 14:02:28 +02:00
|
|
|
double d2 = entityhuman.getZ() - this.getZ();
|
|
|
|
|
double d3 = 0.1D;
|
|
|
|
|
|
|
|
|
|
- entityitem.setDeltaMovement(d0 * 0.1D, d1 * 0.1D + Math.sqrt(Math.sqrt(d0 * d0 + d1 * d1 + d2 * d2)) * 0.08D, d2 * 0.1D);
|
|
|
|
|
- this.level.addFreshEntity(entityitem);
|
|
|
|
|
+ // Paper start, entity item can be null, so we need to check against this
|
|
|
|
|
+ if (entityitem != null) {
|
|
|
|
|
+ entityitem.setDeltaMovement(d0 * 0.1D, d1 * 0.1D + Math.sqrt(Math.sqrt(d0 * d0 + d1 * d1 + d2 * d2)) * 0.08D, d2 * 0.1D);
|
|
|
|
|
+ this.level.addFreshEntity(entityitem);
|
|
|
|
|
+ }
|
|
|
|
|
+ // Paper end
|
|
|
|
|
// CraftBukkit start - this.random.nextInt(6) + 1 -> playerFishEvent.getExpToDrop()
|
|
|
|
|
if (playerFishEvent.getExpToDrop() > 0) {
|
|
|
|
|
entityhuman.level.addFreshEntity(new ExperienceOrb(entityhuman.level, entityhuman.getX(), entityhuman.getY() + 0.5D, entityhuman.getZ() + 0.5D, playerFishEvent.getExpToDrop(), org.bukkit.entity.ExperienceOrb.SpawnReason.FISHING, this.getPlayerOwner(), this)); // Paper
|
