Repo-Mirror/Custom-Fishing
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2026-01-04 15:41:35 +00:00
Code Issues Releases Activity

1.3.0.9

Browse Source
This commit is contained in:
Xiao-MoMi
2023-04-02 21:22:59 +08:00
parent 02134f7086
commit 01dc68f4f1
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -4,7 +4,7 @@ plugins {
}
group = 'net.momirealms'
version = '1.3.0.8'
version = '1.3.0.9'
repositories {
mavenCentral()

26
src/main/java/net/momirealms/customfishing/manager/FishingManager.java
View File

@@ -382,10 +382,10 @@ public class FishingManager extends Function {
final Player player = event.getPlayer();
if (!(event.getCaught() instanceof Item item)) return;
if (ConfigManager.disableBar) {
noBarWaterReelIn(event);
return;
}
// if (ConfigManager.disableBar) {
// noBarWaterReelIn(event);
// return;
// }
FishingGame fishingGame = fishingPlayerMap.remove(player);
// if the player is noy playing the game
@@ -399,7 +399,7 @@ public class FishingManager extends Function {
if (ConfigManager.vanillaLootRatio < Math.random()) {
if (loot != null) {
vanillaLoot.remove(player);
if (loot.isDisableBar()) {
if (loot.isDisableBar() || ConfigManager.disableBar) {
noBarWaterReelIn(event);
return;
}
@@ -407,13 +407,17 @@ public class FishingManager extends Function {
}
else {
vanillaLoot.put(player, new VanillaLoot(item.getItemStack(), event.getExpToDrop()));
if (ConfigManager.disableBar) {
noBarWaterReelIn(event);
return;
}
showFishingBar(player, plugin.getLootManager().getVanilla_loot());
}
event.setCancelled(true);
}
// Is vanilla loot
else {
if (!plugin.getLootManager().getVanilla_loot().isDisableBar()) {
if (!plugin.getLootManager().getVanilla_loot().isDisableBar() && !ConfigManager.disableBar) {
event.setCancelled(true);
vanillaLoot.put(player, new VanillaLoot(item.getItemStack(), event.getExpToDrop()));
showFishingBar(player, plugin.getLootManager().getVanilla_loot());
@@ -424,12 +428,12 @@ public class FishingManager extends Function {
else {
// No custom loot
if (loot == null) {
item.remove();
event.setExpToDrop(0);
event.setCancelled(true);
removeHook(player);
AdventureUtils.playerMessage(player, MessageManager.prefix + MessageManager.noLoot);
}
else {
if (loot.isDisableBar()) {
if (loot.isDisableBar() || ConfigManager.disableBar) {
noBarWaterReelIn(event);
return;
}
@@ -439,8 +443,8 @@ public class FishingManager extends Function {
}
}
else {
item.remove();
event.setExpToDrop(0);
event.setCancelled(true);
removeHook(player);
proceedReelIn(event.getHook().getLocation(), player, fishingGame);
}
}

4
src/main/java/net/momirealms/customfishing/manager/IntegrationManager.java
View File

@@ -73,7 +73,6 @@ public class IntegrationManager extends Function {
this.plugin = plugin;
this.pluginManager = Bukkit.getPluginManager();
this.placeholderManager = new PlaceholderManager(plugin);
this.blockInterface = new VanillaBlockImpl();
}
@Override
@@ -128,6 +127,9 @@ public class IntegrationManager extends Function {
else if (pluginManager.isPluginEnabled("ItemsAdder")) {
this.blockInterface = new ItemsAdderBlockImpl();
}
else {
this.blockInterface = new VanillaBlockImpl();
}
}
private void hookSeasons() {