Skip to content

Commit 11a3bf9

Browse files
Release 1.18.1 (#1886)
* Version 1.18.1 * Added snapshot repo to Maven info. * Fixes console teleporting. #1877 * Address potential NPE's * Preveent NPEs and other items. * Remove dead paper forks (#1884) Tuinity has since merged with Paper, and is now not a valid fork Airplane is shutting down / not updating to 1.18.x * Added toString to resolve issue with arrays * Fix minor JavaDoc mistake Co-authored-by: Fredthedoggy <45927799+Fredthedoggy@users.noreply.github.com>
1 parent df2b445 commit 11a3bf9

File tree

19 files changed

+173
-350
lines changed

19 files changed

+173
-350
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ BentoBox uses Maven, and its Maven repository is kindly provided by [CodeMC](htt
8585
### Maven
8686
```xml
8787
<repositories>
88+
<repository>
89+
<id>codemc-snapshots</id>
90+
<url>https://repo.codemc.org/repository/maven-snapshots</url>
91+
</repository>
8892
<repository>
8993
<id>codemc-repo</id>
9094
<url>https://repo.codemc.org/repository/maven-public/</url>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<!-- Do not change unless you want different name for local builds. -->
8484
<build.number>-LOCAL</build.number>
8585
<!-- This allows to change between versions. -->
86-
<build.version>1.18.0</build.version>
86+
<build.version>1.18.1</build.version>
8787
<sonar.organization>bentobox-world</sonar.organization>
8888
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
8989
</properties>

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminTeleportCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,9 @@ public boolean execute(User user, String label, List<String> args) {
100100
// Otherwise, ask the admin to go to a safe spot
101101
String failureMessage = user.getTranslation("commands.admin.tp.manual", "[location]", warpSpot.getBlockX() + " " + warpSpot.getBlockY() + " "
102102
+ warpSpot.getBlockZ());
103-
104-
Player player = user.getPlayer();
103+
// Set the player
104+
Player player = args.size() == 2 ? userToTeleport.getPlayer() : user.getPlayer();
105105
if (args.size() == 2) {
106-
player = userToTeleport.getPlayer();
107106
failureMessage = userToTeleport.getTranslation(NOT_SAFE);
108107
}
109108

@@ -112,6 +111,7 @@ public boolean execute(User user, String label, List<String> args) {
112111
.entity(player)
113112
.location(warpSpot)
114113
.failureMessage(failureMessage)
114+
.thenRun(() -> user.sendMessage("general.success"))
115115
.build();
116116
return true;
117117
}

src/main/java/world/bentobox/bentobox/api/panels/reader/PanelTemplateRecord.java

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
package world.bentobox.bentobox.api.panels.reader;
88

99

10+
import java.util.Arrays;
11+
import java.util.Objects;
12+
1013
import org.bukkit.inventory.ItemStack;
1114
import org.eclipse.jdt.annotation.NonNull;
1215
import org.eclipse.jdt.annotation.Nullable;
@@ -28,11 +31,11 @@
2831
* @since 1.17.3
2932
*/
3033
public record PanelTemplateRecord(Panel.Type type,
31-
@Nullable String title,
32-
@Nullable TemplateItem border,
33-
@Nullable TemplateItem background,
34-
boolean[] forcedRows,
35-
@NonNull ItemTemplateRecord[][] content)
34+
@Nullable String title,
35+
@Nullable TemplateItem border,
36+
@Nullable TemplateItem background,
37+
boolean[] forcedRows,
38+
@NonNull ItemTemplateRecord[][] content)
3639
{
3740
/**
3841
* Instantiates a new Panel template record with empty content.
@@ -76,4 +79,43 @@ public TemplateItem(ItemStack icon)
7679
this(icon, null, null);
7780
}
7881
}
82+
83+
84+
@Override
85+
public int hashCode() {
86+
final int prime = 31;
87+
int result = 1;
88+
result = prime * result + Arrays.deepHashCode(content);
89+
result = prime * result + Arrays.hashCode(forcedRows);
90+
result = prime * result + Objects.hash(background, border, title, type);
91+
return result;
92+
}
93+
94+
95+
@Override
96+
public boolean equals(Object obj) {
97+
if (this == obj) {
98+
return true;
99+
}
100+
if (!(obj instanceof PanelTemplateRecord)) {
101+
return false;
102+
}
103+
PanelTemplateRecord other = (PanelTemplateRecord) obj;
104+
return Objects.equals(background, other.background) && Objects.equals(border, other.border)
105+
&& Arrays.deepEquals(content, other.content) && Arrays.equals(forcedRows, other.forcedRows)
106+
&& Objects.equals(title, other.title) && type == other.type;
107+
}
108+
109+
110+
@Override
111+
public String toString() {
112+
return "PanelTemplateRecord {type=" + type +
113+
", title=" + title +
114+
", border=" + border +
115+
", background=" + background +
116+
", forcedRows=" + Arrays.toString(forcedRows) +
117+
", content=" + Arrays.toString(content) + "}";
118+
}
119+
120+
79121
}

src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardFormat.java

Lines changed: 0 additions & 136 deletions
This file was deleted.

src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardReader.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardWriter.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintSchematicConverter.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/main/java/world/bentobox/bentobox/database/objects/Players.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public void setPlayerUUID(UUID uuid) {
237237
/**
238238
* Clears all home Locations in world
239239
* @param world - world
240-
* @deprecated Home locations are no longer stored for players. Use {@link IslandManager}
240+
* @deprecated Home locations are no longer stored for players. Use {@link world.bentobox.bentobox.managers.IslandsManager}
241241
*/
242242
@Deprecated(since="1.18.0", forRemoval=true)
243243
public void clearHomeLocations(World world) {

src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/CommandRankClickListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public boolean onClick(Panel panel, User user, ClickType clickType, int slot) {
5757

5858
// Get the user's island
5959
Island island = plugin.getIslands().getIsland(panel.getWorld().orElse(user.getWorld()), user.getUniqueId());
60-
if (island == null || !island.getOwner().equals(user.getUniqueId())) {
60+
if (island == null || island.getOwner() == null || !island.getOwner().equals(user.getUniqueId())) {
6161
user.sendMessage("general.errors.not-owner");
6262
user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F);
6363
return true;

0 commit comments

Comments
 (0)