Compare commits

...
2 Commits
Author SHA1 Message Date
version-bump[github-action] bd12269dc9 Bump version from 5.1.0-SNAPSHOT1 to 5.1.1 2025-07-15 19:20:05 +00:00
Tigerpanzer_02andversion-bump[github-action] 3142f28258 #patch small bug fix (#108)
* Bump version from 5.1.0 to 5.1.0-SNAPSHOT0

* Fixed bba ForcePlayArgument on console without Theme name

* Fixed water flow on other worlds than the plots are

* Bump version from 5.1.0-SNAPSHOT0 to 5.1.0-SNAPSHOT1

---------

Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
2025-07-15 21:19:46 +02:00
4 changed files with 21 additions and 9 deletions

No files matched your search

+4
View File
@@ -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
+1 -1
View File
@@ -26,7 +26,7 @@
<groupId>plugily.projects</groupId>
<artifactId>buildbattle</artifactId>
<version>5.1.0</version>
<version>5.1.1</version>
<name>BuildBattle</name>
<properties>
@@ -596,11 +596,14 @@ public class ArenaEvents extends PluginArenaEvents {
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);
}
}
@@ -48,29 +48,33 @@ public class ForcePlayArgument {
@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 class ForcePlayArgument {
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());