Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-01-20 07:01:22 +01:00
Code Issues Projects Releases Wiki Activity

Clay and Clay block is different thing

Browse Source
This commit is contained in:
Zrips 2018-08-21 13:24:11 +03:00
parent 7b585cf803
commit 0f74421559
8 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>Jobs</groupId>
<artifactId>jobs</artifactId>
<version>4.7.2</version>
<version>4.7.3</version>
<name>Jobs</name>
<url>http://maven.apache.org</url>
<properties>
@ -125,14 +125,14 @@
<target>1.7</target>
</configuration>
</plugin>
<!--<plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<outputDirectory>C:\Users\Arte\Desktop\Server\plugins</outputDirectory>
</configuration>
</plugin>-->
</plugin>
</plugins>
</build>
</project>

3
src/main/java/com/gamingmesh/jobs/CMILib/CMIEffect.java
View File

@ -1,3 +1,6 @@
/**
* Copyright (C) 2017 Zrips
*/
package com.gamingmesh.jobs.CMILib;
import org.bukkit.Color;

3
src/main/java/com/gamingmesh/jobs/CMILib/CMIEffectManager.java
View File

@ -1,3 +1,6 @@
/**
* Copyright (C) 2017 Zrips
*/
package com.gamingmesh.jobs.CMILib;
import java.util.ArrayList;

3
src/main/java/com/gamingmesh/jobs/CMILib/CMIItemStack.java
View File

@ -1,3 +1,6 @@
/**
* Copyright (C) 2017 Zrips
*/
package com.gamingmesh.jobs.CMILib;
import java.util.ArrayList;

7
src/main/java/com/gamingmesh/jobs/CMILib/ItemManager.java
View File

@ -1,3 +1,6 @@
/**
* Copyright (C) 2017 Zrips
*/
package com.gamingmesh.jobs.CMILib;
import java.util.ArrayList;
@ -744,8 +747,8 @@ public class ItemManager {
CHORUS_FLOWER(200, 0, 28542, "Chorus Flower", "CHORUS_FLOWER"),
CHORUS_FRUIT(432, 0, 7652, "Chorus Fruit", ""),
CHORUS_PLANT(199, 0, 28243, "Chorus Plant", "CHORUS_PLANT"),
CLAY(82, 0, 27880, "Clay", "CLAY"),
CLAY_BALL(337, 0, 24603, "Clay Ball", "Clay"),
CLAY(82, 0, 27880, "Clay", "Clay Block"),
CLAY_BALL(337, 0, 24603, "Clay Ball"),
CLOCK(347, 0, 14980, "Clock", "watch"),
COAL(263, 0, 29067, "Coal", ""),
COAL_BLOCK(173, 0, 27968, "Block of Coal", "COAL_BLOCK"),

12
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -180,7 +180,7 @@ public class ConfigManager {
myKey = myKey.split("-")[0];
}
CMIMaterial material = CMIMaterial.get(myKey);
CMIMaterial material = CMIMaterial.get(myKey + (subType));
if (material == null)
material = CMIMaterial.get(myKey.replace(" ", "_").toUpperCase());
@ -228,8 +228,8 @@ public class ConfigManager {
// Break and Place actions MUST be blocks
if (actionType == ActionType.BREAK || actionType == ActionType.PLACE) {
if (!material.isBlock()) {
Jobs.getPluginLogger().warning("Job " + jobName + " has an invalid " + actionType.getName() + " type property: " + myKey
+ "! Material must be a block!");
Jobs.getPluginLogger().warning("Job " + jobName + " has an invalid " + actionType.getName() + " type property: " + material
+ "(" + myKey + ")! Material must be a block!");
return null;
}
}
@ -878,8 +878,8 @@ public class ConfigManager {
// Break and Place actions MUST be blocks
if (actionType == ActionType.BREAK || actionType == ActionType.PLACE) {
if (!material.isBlock()) {
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid " + actionType.getName() + " type property: " + key
+ "! Material must be a block!");
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid " + actionType.getName() + " type property: " + material
+ " (" + key + ")! Material must be a block!");
continue;
}
}
@ -1042,7 +1042,7 @@ public class ConfigManager {
case EAT:
case CRAFT:
case BREAK:
if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)){
if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) {
subType = "";
meta = "";
}

2
src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java
View File

@ -37,7 +37,7 @@ public class BufferedEconomy {
private Jobs plugin;
private Economy economy;
private LinkedBlockingQueue<BufferedPayment> payments = new LinkedBlockingQueue<>();
private final Map<UUID, BufferedPayment> paymentCache = Collections.synchronizedMap(new HashMap<>());
private final Map<UUID, BufferedPayment> paymentCache = Collections.synchronizedMap(new HashMap<UUID, BufferedPayment>());
private OfflinePlayer ServerAccount = null;
private OfflinePlayer ServerTaxesAccount = null;

4
src/main/java/com/gamingmesh/jobs/selection/SelectionManager.java
View File

@ -14,8 +14,8 @@ public class SelectionManager {
public static final int MIN_HEIGHT = 0;
public SelectionManager() {
playerLoc1 = Collections.synchronizedMap(new HashMap<>());
playerLoc2 = Collections.synchronizedMap(new HashMap<>());
playerLoc1 = Collections.synchronizedMap(new HashMap<String, Location>());
playerLoc2 = Collections.synchronizedMap(new HashMap<String, Location>());
}
public void updateLocations(Player player, Location loc1, Location loc2) {