Skip to content

Commit d95b021

Browse files
authored
Merge pull request #2726 from BentoBoxWorld/develop
3.7.3 fixes
2 parents 5c168da + 4f2284c commit d95b021

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

src/main/java/world/bentobox/bentobox/api/github/GitHubWebAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
/**
1919
* Handles interactions with the GitHub API.
20-
* This is a rewrite of {@link https://github.com/Poslovitch/GitHubWebAPI4}, which is now out of date
20+
* This is a rewrite of https://github.com/Poslovitch/GitHubWebAPI4, which is now out of date
2121
* and this code only implements parts that are used by BentoBox and not all of it.
2222
*/
2323
public class GitHubWebAPI {

src/main/java/world/bentobox/bentobox/api/github/objects/repositories/GitHubRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public String getFullName() {
2828
/**
2929
* Fetches the content of a file in the repository.
3030
*
31-
* @param fpath The path to the file.
31+
* @param path The path to the file.
3232
* @return A GitHubFile object representing the file content.
3333
* @throws Exception If an error occurs during the request.
3434
*/

src/main/java/world/bentobox/bentobox/blueprints/dataobjects/BlueprintEntity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ public BlueprintEntity() {
236236
/**
237237
* Set the villager stats
238238
* @param v - villager
239-
* @param bpe - Blueprint Entity
240239
*/
241240
private void configVillager(Villager v) {
242241
this.setExperience(v.getVillagerExperience());

src/main/java/world/bentobox/bentobox/database/json/adapters/TagTypeAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* @author tastybento
2020
*
21-
* @param <T> Tag class to be serialized
21+
* @param <E> Tag class to be serialized
2222
*/
2323
public final class TagTypeAdapter<E extends Keyed> extends TypeAdapter<Tag<E>> {
2424
private final TypeAdapter<String> stringAdapter;

src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void clearBlockInfo(Location location) {
8686
/**
8787
* Returns Optional empty if the provided {@link ItemStack} is not a custom item created with ItemsAdder.
8888
*
89-
* @param itemStack the Bukkit ItemStack
89+
* @param myItemStack the Bukkit ItemStack
9090
* @return optional namespacedId or empty
9191
*/
9292
public static Optional<String> getNamespacedId(ItemStack myItemStack) {
@@ -105,7 +105,7 @@ public static Set<String> getAllBlocks() {
105105
/**
106106
* Gets the Namespace and ID in the format {@code namespace:id} of the placed CustomBlock in a specific location.
107107
*
108-
* @param location the location to check
108+
* @param loc the location to check
109109
* @return the Namespace and ID in the format {@code namespace:id} or null if it's not a CustomBlock.
110110
*/
111111
public static String getInCustomRegion(Location loc) {
@@ -134,7 +134,7 @@ public static Optional<ItemStack> getItemStack(String namespacedId) {
134134
* not exist it will fail silently.
135135
*
136136
* @param namespacedId Namespace and ID in the format {@code namespace:id}
137-
* @param location The location to place the CustomBlock
137+
* @param loc The location to place the CustomBlock
138138
*/
139139
public static void place(String namespacedId, Location loc) {
140140
CustomBlock.place(namespacedId, loc);

src/test/java/world/bentobox/bentobox/api/commands/island/IslandResetCommandTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public void testNoIsland() {
201201
// Test the reset command
202202
// Does not have island
203203
assertFalse(irc.canExecute(user, irc.getLabel(), Collections.emptyList()));
204-
verify(user).sendMessage("general.errors.no-island");
204+
verify(user).sendMessage("general.errors.not-owner");
205205
}
206206

207207
/**

0 commit comments

Comments
 (0)