Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop 

Conflicts:
	src/main/java/world/bentobox/bentobox/api/events/team/TeamEvent.java
	src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java
	src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardFormat.java
	src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardReader.java
	src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintClipboardWriter.java
	src/main/java/world/bentobox/bentobox/blueprints/worldedit/BlueprintSchematicConverter.java
	src/main/java/world/bentobox/bentobox/listeners/flags/settings/PVPListener.java
This commit is contained in:
tastybento 2021-11-11 10:40:17 -08:00
parent 5e3cffbe11 df2b445002
commit 22c62c91b4
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/world/bentobox/bentobox/api/events/team/TeamEvent.java
View File

@ -81,7 +81,6 @@ public class TeamEvent {
return this;
}
private IslandBaseEvent getEvent() {
return switch (reason) {
case JOIN -> new TeamJoinEvent(island, player, admin, location);

1
src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java
View File

@ -337,7 +337,6 @@ public class TemplateReader
actionDataSection.getString("type"),
actionDataSection.getString("content"),
actionDataSection.getString("tooltip"));
itemRecord.addAction(actionData);
}
}

2
src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
View File

@ -1183,6 +1183,8 @@ public class IslandsManager {
// Set the game mode
user.setGameMode(plugin.getIWM().getDefaultGameMode(world));
}
// Remove from mid-teleport set
goingHome.remove(user.getUniqueId());
}
/**