Repo-Mirror/Custom-Fishing
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2025-12-19 15:09:24 +00:00
Code Issues Releases Activity

2.1.3

Browse Source
This commit is contained in:
XiaoMoMi
2024-03-27 01:59:02 +08:00
parent fad751818b
commit 54445d1464
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -7,7 +7,7 @@ plugins {
allprojects {
version = "2.1.2.1"
version = "2.1.3"
apply<JavaPlugin>()
apply(plugin = "java")

37
plugin/src/main/java/net/momirealms/customfishing/mechanic/item/ItemManagerImpl.java
View File

@@ -78,6 +78,7 @@ import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.*;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
public class ItemManagerImpl implements ItemManager, Listener {
@@ -484,6 +485,13 @@ public class ItemManagerImpl implements ItemManager, Listener {
return;
}
itemEntity.setInvulnerable(true);
plugin.getScheduler().runTaskAsyncLater(() -> {
if (itemEntity.isValid()) {
itemEntity.setInvulnerable(false);
}
}, 1, TimeUnit.SECONDS);
Vector vector = playerLocation.subtract(hookLocation).toVector().multiply(0.105);
vector = vector.setY((vector.getY() + 0.22) * 1.18);
itemEntity.setVelocity(vector);
@@ -968,7 +976,7 @@ public class ItemManagerImpl implements ItemManager, Listener {
* @param event The PlayerInteractEvent.
*/
@EventHandler
public void onInteractWithUtils(PlayerInteractEvent event) {
public void onInteractWithItems(PlayerInteractEvent event) {
if (event.useItemInHand() == Event.Result.DENY)
return;
if (event.getHand() != EquipmentSlot.HAND)
@@ -979,16 +987,27 @@ public class ItemManagerImpl implements ItemManager, Listener {
if (event.getAction() != org.bukkit.event.block.Action.RIGHT_CLICK_AIR && event.getAction() != org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK)
return;
String id = getAnyPluginItemID(itemStack);
EffectCarrier carrier = plugin.getEffectManager().getEffectCarrier("util", id);
if (carrier == null)
return;
Condition condition = new Condition(event.getPlayer());
if (!RequirementManager.isRequirementMet(condition, carrier.getRequirements()))
Loot loot = plugin.getLootManager().getLoot(id);
if (loot != null) {
loot.triggerActions(ActionTrigger.INTERACT, condition);
return;
Action[] actions = carrier.getActions(ActionTrigger.INTERACT);
if (actions != null)
for (Action action : actions) {
action.trigger(condition);
}
// because the id can be from other plugins, so we can't infer the type of the item
for (String type : List.of("util", "bait", "rod", "hook")) {
EffectCarrier carrier = plugin.getEffectManager().getEffectCarrier(type, id);
if (carrier != null) {
if (!RequirementManager.isRequirementMet(condition, carrier.getRequirements()))
return;
Action[] actions = carrier.getActions(ActionTrigger.INTERACT);
if (actions != null)
for (Action action : actions) {
action.trigger(condition);
}
break;
}
}
}
}