mirror of
https://github.com/Zrips/Jobs.git
synced 2025-01-20 07:01:22 +01:00
Clay and Clay block is different thing
This commit is contained in:
parent
7b585cf803
commit
0f74421559
6
pom.xml
6
pom.xml
@ -5,7 +5,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>Jobs</groupId>
|
<groupId>Jobs</groupId>
|
||||||
<artifactId>jobs</artifactId>
|
<artifactId>jobs</artifactId>
|
||||||
<version>4.7.2</version>
|
<version>4.7.3</version>
|
||||||
<name>Jobs</name>
|
<name>Jobs</name>
|
||||||
<url>http://maven.apache.org</url>
|
<url>http://maven.apache.org</url>
|
||||||
<properties>
|
<properties>
|
||||||
@ -125,14 +125,14 @@
|
|||||||
<target>1.7</target>
|
<target>1.7</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!--<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<version>2.3.1</version>
|
<version>2.3.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<outputDirectory>C:\Users\Arte\Desktop\Server\plugins</outputDirectory>
|
<outputDirectory>C:\Users\Arte\Desktop\Server\plugins</outputDirectory>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>-->
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2017 Zrips
|
||||||
|
*/
|
||||||
package com.gamingmesh.jobs.CMILib;
|
package com.gamingmesh.jobs.CMILib;
|
||||||
|
|
||||||
import org.bukkit.Color;
|
import org.bukkit.Color;
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2017 Zrips
|
||||||
|
*/
|
||||||
package com.gamingmesh.jobs.CMILib;
|
package com.gamingmesh.jobs.CMILib;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2017 Zrips
|
||||||
|
*/
|
||||||
package com.gamingmesh.jobs.CMILib;
|
package com.gamingmesh.jobs.CMILib;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2017 Zrips
|
||||||
|
*/
|
||||||
package com.gamingmesh.jobs.CMILib;
|
package com.gamingmesh.jobs.CMILib;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -744,8 +747,8 @@ public class ItemManager {
|
|||||||
CHORUS_FLOWER(200, 0, 28542, "Chorus Flower", "CHORUS_FLOWER"),
|
CHORUS_FLOWER(200, 0, 28542, "Chorus Flower", "CHORUS_FLOWER"),
|
||||||
CHORUS_FRUIT(432, 0, 7652, "Chorus Fruit", ""),
|
CHORUS_FRUIT(432, 0, 7652, "Chorus Fruit", ""),
|
||||||
CHORUS_PLANT(199, 0, 28243, "Chorus Plant", "CHORUS_PLANT"),
|
CHORUS_PLANT(199, 0, 28243, "Chorus Plant", "CHORUS_PLANT"),
|
||||||
CLAY(82, 0, 27880, "Clay", "CLAY"),
|
CLAY(82, 0, 27880, "Clay", "Clay Block"),
|
||||||
CLAY_BALL(337, 0, 24603, "Clay Ball", "Clay"),
|
CLAY_BALL(337, 0, 24603, "Clay Ball"),
|
||||||
CLOCK(347, 0, 14980, "Clock", "watch"),
|
CLOCK(347, 0, 14980, "Clock", "watch"),
|
||||||
COAL(263, 0, 29067, "Coal", ""),
|
COAL(263, 0, 29067, "Coal", ""),
|
||||||
COAL_BLOCK(173, 0, 27968, "Block of Coal", "COAL_BLOCK"),
|
COAL_BLOCK(173, 0, 27968, "Block of Coal", "COAL_BLOCK"),
|
||||||
|
@ -180,7 +180,7 @@ public class ConfigManager {
|
|||||||
myKey = myKey.split("-")[0];
|
myKey = myKey.split("-")[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
CMIMaterial material = CMIMaterial.get(myKey);
|
CMIMaterial material = CMIMaterial.get(myKey + (subType));
|
||||||
|
|
||||||
if (material == null)
|
if (material == null)
|
||||||
material = CMIMaterial.get(myKey.replace(" ", "_").toUpperCase());
|
material = CMIMaterial.get(myKey.replace(" ", "_").toUpperCase());
|
||||||
@ -228,8 +228,8 @@ public class ConfigManager {
|
|||||||
// Break and Place actions MUST be blocks
|
// Break and Place actions MUST be blocks
|
||||||
if (actionType == ActionType.BREAK || actionType == ActionType.PLACE) {
|
if (actionType == ActionType.BREAK || actionType == ActionType.PLACE) {
|
||||||
if (!material.isBlock()) {
|
if (!material.isBlock()) {
|
||||||
Jobs.getPluginLogger().warning("Job " + jobName + " has an invalid " + actionType.getName() + " type property: " + myKey
|
Jobs.getPluginLogger().warning("Job " + jobName + " has an invalid " + actionType.getName() + " type property: " + material
|
||||||
+ "! Material must be a block!");
|
+ "(" + myKey + ")! Material must be a block!");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -878,8 +878,8 @@ public class ConfigManager {
|
|||||||
// Break and Place actions MUST be blocks
|
// Break and Place actions MUST be blocks
|
||||||
if (actionType == ActionType.BREAK || actionType == ActionType.PLACE) {
|
if (actionType == ActionType.BREAK || actionType == ActionType.PLACE) {
|
||||||
if (!material.isBlock()) {
|
if (!material.isBlock()) {
|
||||||
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid " + actionType.getName() + " type property: " + key
|
Jobs.getPluginLogger().warning("Job " + jobKey + " has an invalid " + actionType.getName() + " type property: " + material
|
||||||
+ "! Material must be a block!");
|
+ " (" + key + ")! Material must be a block!");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1042,7 +1042,7 @@ public class ConfigManager {
|
|||||||
case EAT:
|
case EAT:
|
||||||
case CRAFT:
|
case CRAFT:
|
||||||
case BREAK:
|
case BREAK:
|
||||||
if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)){
|
if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) {
|
||||||
subType = "";
|
subType = "";
|
||||||
meta = "";
|
meta = "";
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ public class BufferedEconomy {
|
|||||||
private Jobs plugin;
|
private Jobs plugin;
|
||||||
private Economy economy;
|
private Economy economy;
|
||||||
private LinkedBlockingQueue<BufferedPayment> payments = new LinkedBlockingQueue<>();
|
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 ServerAccount = null;
|
||||||
private OfflinePlayer ServerTaxesAccount = null;
|
private OfflinePlayer ServerTaxesAccount = null;
|
||||||
|
@ -14,8 +14,8 @@ public class SelectionManager {
|
|||||||
public static final int MIN_HEIGHT = 0;
|
public static final int MIN_HEIGHT = 0;
|
||||||
|
|
||||||
public SelectionManager() {
|
public SelectionManager() {
|
||||||
playerLoc1 = Collections.synchronizedMap(new HashMap<>());
|
playerLoc1 = Collections.synchronizedMap(new HashMap<String, Location>());
|
||||||
playerLoc2 = Collections.synchronizedMap(new HashMap<>());
|
playerLoc2 = Collections.synchronizedMap(new HashMap<String, Location>());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateLocations(Player player, Location loc1, Location loc2) {
|
public void updateLocations(Player player, Location loc1, Location loc2) {
|
||||||
|
Loading…
Reference in New Issue
Block a user