From afa8974652a622ac7bebf80b79a7f4c435d0d839 Mon Sep 17 00:00:00 2001
From: "version-bump[github-action]"
<41898282+version-bump[github-action]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 21:22:16 +0000
Subject: [PATCH 1/4] Bump version from 5.1.0 to 5.1.0-SNAPSHOT0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6ab6f3b5..a0ac55c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
plugily.projects
buildbattle
- 5.1.0
+ 5.1.0-SNAPSHOT0
BuildBattle
From 521b9469a8b37e9a893f7a101773aaadba3b130d Mon Sep 17 00:00:00 2001
From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com>
Date: Tue, 15 Jul 2025 20:54:00 +0200
Subject: [PATCH 2/4] Fixed bba ForcePlayArgument on console without Theme name
---
.../admin/arena/ForcePlayArgument.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/plugily/projects/buildbattle/commands/arguments/admin/arena/ForcePlayArgument.java b/src/main/java/plugily/projects/buildbattle/commands/arguments/admin/arena/ForcePlayArgument.java
index a16cf5f9..8b54c7f7 100644
--- a/src/main/java/plugily/projects/buildbattle/commands/arguments/admin/arena/ForcePlayArgument.java
+++ b/src/main/java/plugily/projects/buildbattle/commands/arguments/admin/arena/ForcePlayArgument.java
@@ -48,29 +48,33 @@ public ForcePlayArgument(ArgumentsRegistry registry) {
@Override
public void execute(CommandSender sender, String[] args) {
if(args.length == 1) {
- //todo translatable
new MessageBuilder("&cPlease type arena theme!").prefix().send(sender);
return;
}
BaseArena arena;
int themeArgStart = 1;
if(!(sender instanceof Player)) {
- if(args.length == 2) {
- //todo translatable
- new MessageBuilder("&cPlease type arena name!").prefix().send(sender);
+ arena = (BaseArena) registry.getPlugin().getArenaRegistry().getArena(args[1]);
+ if(args.length == 2 && arena != null) {
+ BaseArena finalArena = arena;
+ Bukkit.getOnlinePlayers().forEach(player -> {
+ registry.getPlugin().getArenaManager().joinAttempt(player, finalArena);
+ });
+ arena.setForceStart(true);
return;
}
- arena = (BaseArena) registry.getPlugin().getArenaRegistry().getArena(args[1]);
themeArgStart = 2;
} else {
arena = (BaseArena) registry.getPlugin().getArenaRegistry().getArena((Player) sender);
+ if(arena == null) {
+ arena = (BaseArena) registry.getPlugin().getArenaRegistry().getArena(args[1]);
+ }
}
if(arena == null) {
new MessageBuilder("COMMANDS_NOT_PLAYING").asKey().send(sender);
return;
}
if(!(arena instanceof BuildArena)) {
- //todo translatable
new MessageBuilder("&cCan't set theme on this arena type!").prefix().send(sender);
return;
}
@@ -83,8 +87,9 @@ public void execute(CommandSender sender, String[] args) {
new MessageBuilder("COMMANDS_THEME_BLACKLISTED").asKey().prefix().send(sender);
return;
}
+ BaseArena finalArena1 = arena;
Bukkit.getOnlinePlayers().forEach(player -> {
- registry.getPlugin().getArenaManager().joinAttempt(player, arena);
+ registry.getPlugin().getArenaManager().joinAttempt(player, finalArena1);
});
arena.setForceStart(true);
arena.setTheme(themeName.toString());
From 148c3ee4364a4a616a1861268084ade0f73d4b9b Mon Sep 17 00:00:00 2001
From: Tigerpanzer_02 <37453987+Tigerpanzer02@users.noreply.github.com>
Date: Tue, 15 Jul 2025 21:04:14 +0200
Subject: [PATCH 3/4] Fixed water flow on other worlds than the plots are
---
.github/CHANGELOG.md | 4 ++++
.../java/plugily/projects/buildbattle/arena/ArenaEvents.java | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 89e2a82a..f8928ce2 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -10,6 +10,10 @@ deploy webhooks to print changelog successfully
That's all, matcher will stop when detects next line started with `###` match
+### 5.1.1 Release
+* Fixed liquid flow outside plots and different worlds
+* Fixed forceplay console command without theme
+
### 5.1.0 Release (10.07.2025)
* Added Heads from HeadDatabase (selected on each server start 200 per category)
* Added Heads Search function
diff --git a/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java b/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java
index 8319227c..0c0fe9e3 100644
--- a/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java
+++ b/src/main/java/plugily/projects/buildbattle/arena/ArenaEvents.java
@@ -596,11 +596,14 @@ public void onWaterFlowEvent(BlockFromToEvent event) {
continue;
}
for(Plot buildPlot : ((BaseArena) arena).getPlotManager().getPlots()) {
+ if(buildPlot.getTeleportLocation().getWorld() != toBlock.getWorld()) {
+ continue;
+ }
if(buildPlot.getCuboid() != null) {
if(!buildPlot.getCuboid().isIn(toBlock) && buildPlot.getCuboid().isIn(blockLoc)) {
event.setCancelled(true);
}
- if(!buildPlot.getCuboid().isIn(toBlock)) {
+ if(!buildPlot.getCuboid().isInWithMarge(toBlock, -1) && buildPlot.getCuboid().isIn(toBlock)) {
event.setCancelled(true);
}
}
From aa82767985acfb9c4818c740c6d463b2c8a36c01 Mon Sep 17 00:00:00 2001
From: "version-bump[github-action]"
<41898282+version-bump[github-action]@users.noreply.github.com>
Date: Tue, 15 Jul 2025 19:04:21 +0000
Subject: [PATCH 4/4] Bump version from 5.1.0-SNAPSHOT0 to 5.1.0-SNAPSHOT1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a0ac55c4..20d10895 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
plugily.projects
buildbattle
- 5.1.0-SNAPSHOT0
+ 5.1.0-SNAPSHOT1
BuildBattle