Skip to content

Commit

Permalink
removed bug
Browse files Browse the repository at this point in the history
an error occured everytime a player left
  • Loading branch information
GorgeousOne committed Mar 4, 2020
1 parent 5dfc71e commit 8dad863
Show file tree
Hide file tree
Showing 18 changed files with 169 additions and 38 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

.classpath
.project
.idea/
target/
*.iml

.idea/workspace.xml
.idea/modules.xml

*.iml
8 changes: 8 additions & 0 deletions .idea/artifacts/TangledMaze_jar.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_google_code_gson_gson_2_8_0.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_google_guava_guava_21_0.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__commons_lang_commons_lang_2_6.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__net_md_5_bungeecord_chat_1_15_SNAPSHOT.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 8 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

<groupId>me.gorgeousone</groupId>
<artifactId>tangledmaze</artifactId>
<version>1.3.5</version>
<version>1.3.6</version>
<packaging>jar</packaging>

<name>TangledMaze</name>

<description>intuitive visual maze generator for every shape and every terrain</description>
<description>ease-to-use maze generator for every shape and terrain</description>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -57,30 +57,21 @@

<repositories>
<repository>
<id>spigot-repo</id>
<id>spigotmc-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/groups/public/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.15.1-R0.1-SNAPSHOT</version>
<version>1.15.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.6.0-M1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>

</dependencies>
</project>
11 changes: 5 additions & 6 deletions src/main/java/me/gorgeousone/tangledmaze/TangledMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ public class TangledMain extends JavaPlugin {
private BuildHandler buildHandler;
private Renderer renderer;

@Override
public void onDisable() {
renderer.hideAllClues();
super.onDisable();
}

@Override
public void onEnable() {

Expand All @@ -60,6 +54,11 @@ public void onEnable() {
registerCommands();
}

@Override
public void onDisable() {
renderer.hideAllClues();
}

public void reloadPlugin() {

loadMessages();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,11 @@ protected boolean onCommand(CommandSender sender, ArgValue[] arguments) {
return false;

}
// catch (Exception ex) {
// player.sendMessage(ex.getClass().getSimpleName());
// player.sendMessage(ex.getMessage());
// return false;
// }

if (!maze.isConstructed()) {

if (!mazePart.isMazeBuiltBefore()) {
toolHandler.removeTool(maze.getPlayer());
toolHandler.removePlayer(maze.getPlayer());

} else {
Messages.ERROR_MAZE_NOT_BUILT.sendTo(sender);
Expand Down
18 changes: 14 additions & 4 deletions src/main/java/me/gorgeousone/tangledmaze/handlers/MazeHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,24 @@ public void setMaze(Player player, Maze newMaze) {

public void removeMaze(Player player) {

if (!hasMaze(player))
return;

Maze maze = getMaze(player);
this.renderer.hideMaze(maze);
this.renderer.unregisterMaze(maze);
this.buildHandler.removeMaze(maze);
this.playerMazes.remove(player.getUniqueId());
}

public void removePlayer(Player player) {

renderer.hideMaze(maze);
renderer.unregisterMaze(maze);
buildHandler.removeMaze(maze);
playerMazes.remove(player.getUniqueId());
Maze maze = getMaze(player);
this.buildHandler.removeMaze(maze);
this.playerMazes.remove(player.getUniqueId());
}


public Maze getStartedMaze(Player player, boolean withExits, boolean notConstructed) {

Maze maze = getMaze(player);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public boolean setToolType(Player player, ToolType toolType) {
return playersTools.put(player.getUniqueId(), toolType) != toolType;
}

public void removeTool(Player player) {
public void removePlayer(Player player) {

if(getToolType(player) == ToolType.CLIP_TOOL)
clipHandler.removePlayer(player);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public void onPlayerQuit(PlayerQuitEvent e) {
Player player = e.getPlayer();

if (player.hasPermission(Constants.BUILD_PERM)) {
toolHandler.removeTool(player);
mazeHandler.removeMaze(player);
toolHandler.removePlayer(player);
mazeHandler.removePlayer(player);
}
}
}

0 comments on commit 8dad863

Please sign in to comment.