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

fix size

Browse Source
This commit is contained in:
XiaoMoMi
2023-11-27 04:42:53 +08:00
parent b5454d2c42
commit cdcac2b318
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/src/main/java/net/momirealms/customfishing/command/sub/DebugCommand.java
View File

@@ -55,7 +55,8 @@ public class DebugCommand {
getSeasonCommand(), getSeasonCommand(),
getGroupCommand(), getGroupCommand(),
getCategoryCommand(), getCategoryCommand(),
getNBTCommand() getNBTCommand(),
getLocationCommand()
); );
} }
@@ -66,6 +67,13 @@ public class DebugCommand {
}); });
} }
public CommandAPICommand getLocationCommand() {
return new CommandAPICommand("location")
.executesPlayer((player, arg) -> {
AdventureManagerImpl.getInstance().sendMessage(player, player.getLocation().toString());
});
}
public CommandAPICommand getNBTCommand() { public CommandAPICommand getNBTCommand() {
return new CommandAPICommand("nbt") return new CommandAPICommand("nbt")
.executesPlayer((player, arg) -> { .executesPlayer((player, arg) -> {
@@ -168,7 +176,7 @@ public class DebugCommand {
public record LootWithWeight(String key, double weight) { public record LootWithWeight(String key, double weight) {
} }
public static void quickSort(LootWithWeight[] loot, int low, int high) { private static void quickSort(LootWithWeight[] loot, int low, int high) {
if (low < high) { if (low < high) {
int pi = partition(loot, low, high); int pi = partition(loot, low, high);
quickSort(loot, low, pi - 1); quickSort(loot, low, pi - 1);
@@ -176,7 +184,7 @@ public class DebugCommand {
} }
} }
public static int partition(LootWithWeight[] loot, int low, int high) { private static int partition(LootWithWeight[] loot, int low, int high) {
double pivot = loot[high].weight(); double pivot = loot[high].weight();
int i = low - 1; int i = low - 1;
for (int j = low; j <= high - 1; j++) { for (int j = low; j <= high - 1; j++) {
@@ -189,7 +197,7 @@ public class DebugCommand {
return i + 1; return i + 1;
} }
public static void swap(LootWithWeight[] loot, int i, int j) { private static void swap(LootWithWeight[] loot, int i, int j) {
LootWithWeight temp = loot[i]; LootWithWeight temp = loot[i];
loot[i] = loot[j]; loot[i] = loot[j];
loot[j] = temp; loot[j] = temp;

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

@@ -726,7 +726,7 @@ public class ItemManagerImpl implements ItemManager, Listener {
if (size == null) return this; if (size == null) return this;
editors.put("size", (player, nbtItem, placeholders) -> { editors.put("size", (player, nbtItem, placeholders) -> {
NBTCompound cfCompound = nbtItem.getOrCreateCompound("CustomFishing"); NBTCompound cfCompound = nbtItem.getOrCreateCompound("CustomFishing");
float random = size.left() + size.left() <= size.right() ? 0 : ThreadLocalRandom.current().nextFloat(size.right() - size.left()); float random = size.left() + (size.left() >= size.right() ? 0 : ThreadLocalRandom.current().nextFloat(size.right() - size.left()));
float bonus = Float.parseFloat(placeholders.getOrDefault("{size-multiplier}", "1.0")); float bonus = Float.parseFloat(placeholders.getOrDefault("{size-multiplier}", "1.0"));
double fixed = Double.parseDouble(placeholders.getOrDefault("{size-fixed}", "0.0")); double fixed = Double.parseDouble(placeholders.getOrDefault("{size-fixed}", "0.0"));
random *= bonus; random *= bonus;