Skip to content

Commit

Permalink
Merge pull request #539 from DansPlugins/locked-blocks-fix
Browse files Browse the repository at this point in the history
Locked blocks fix
  • Loading branch information
dmccoystephenson authored Aug 9, 2020
2 parents 6763fc3 + 9e51226 commit 06d17d3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>KingdomProgrammers</groupId>
<artifactId>Medieval-Factions</artifactId>
<version>v3.4</version>
<version>v3.4.1</version>
<packaging>jar</packaging>

<name>Medieval Factions</name>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/factionsystem/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
public class Main extends JavaPlugin implements Listener {

// version
public static String version = "v3.4";
public static String version = "v3.4.1";

// subsystems
public StorageSubsystem storage = new StorageSubsystem(this);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/factionsystem/Objects/LockedBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ private void load(Map<String, String> data) {
z = gson.fromJson(data.get("Z"), Integer.TYPE);
owner = UUID.fromString(gson.fromJson(data.get("owner"), String.class));
factionName = gson.fromJson(data.get("factionName"), String.class);
accessList = gson.fromJson(data.get("accessList"), new TypeToken<ArrayList<String>>(){}.getType());
accessList = gson.fromJson(data.get("accessList"), new TypeToken<ArrayList<UUID>>(){}.getType());
}

public void legacyLoad(String filename) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: MedievalFactions
version: 3.4
version: 3.4.1
author: KingdomProgrammers
main: factionsystem.Main
api-version: 1.13
Expand Down

0 comments on commit 06d17d3

Please sign in to comment.