Upstream/EpicAnchors
1
0
Fork 0
mirror of https://github.com/songoda/EpicAnchors.git synced 2024-10-31 23:59:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Christian Koop 2022-03-18 18:06:48 +01:00
commit 4c4bb1555b
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>EpicAnchors</artifactId> <artifactId>EpicAnchors</artifactId>
<version>2.2.0</version> <version>2.2.1</version>
<name>EpicAnchors</name> <name>EpicAnchors</name>
<description>Allow your players to keep chunks loaded for a limited amount of time for a cost.</description> <description>Allow your players to keep chunks loaded for a limited amount of time for a cost.</description>
@ -149,7 +149,7 @@
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId> <artifactId>SongodaCore</artifactId>
<version>2.6.10</version> <version>2.6.12</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

24
src/main/java/com/songoda/epicanchors/AnchorManager.java
View File

@ -5,8 +5,7 @@ import com.songoda.core.compatibility.CompatibleMaterial;
import com.songoda.core.compatibility.CompatibleParticleHandler; import com.songoda.core.compatibility.CompatibleParticleHandler;
import com.songoda.core.compatibility.CompatibleSound; import com.songoda.core.compatibility.CompatibleSound;
import com.songoda.core.hooks.HologramManager; import com.songoda.core.hooks.HologramManager;
import com.songoda.core.nms.NmsManager; import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
import com.songoda.core.nms.nbt.NBTItem;
import com.songoda.core.utils.TextUtils; import com.songoda.core.utils.TextUtils;
import com.songoda.core.utils.TimeUtils; import com.songoda.core.utils.TimeUtils;
import com.songoda.epicanchors.api.AnchorAccessCheck; import com.songoda.epicanchors.api.AnchorAccessCheck;
@ -358,24 +357,27 @@ public class AnchorManager {
meta.setLore(TextUtils.formatText(Settings.LORE.getString().split("\r?\n"))); meta.setLore(TextUtils.formatText(Settings.LORE.getString().split("\r?\n")));
item.setItemMeta(meta); item.setItemMeta(meta);
NBTItem nbtItem = NmsManager.getNbt().of(item); NBTItem nbtItem = new NBTItem(item);
nbtItem.set(NBT_TICKS_KEY, ticks); nbtItem.setInteger(NBT_TICKS_KEY, ticks);
return nbtItem.finish(); return nbtItem.getItem();
} }
public static int getTicksFromItem(ItemStack item) { public static int getTicksFromItem(ItemStack item) {
NBTItem nbtItem = NmsManager.getNbt().of(item); if (item == null || item.getType() == Material.AIR) {
return 0;
}
if (nbtItem.has(NBT_TICKS_KEY)) { NBTItem nbtItem = new NBTItem(item);
return nbtItem.getInt(NBT_TICKS_KEY);
if (nbtItem.hasKey(NBT_TICKS_KEY)) {
return nbtItem.getInteger(NBT_TICKS_KEY);
} }
// Legacy code (pre v2) to stay cross-version compatible // Legacy code (pre v2) to stay cross-version compatible
if (Settings.MATERIAL.getMaterial().getMaterial() == item.getType()) { if (Settings.MATERIAL.getMaterial().getMaterial() == item.getType()) {
if (nbtItem.hasKey("ticks")) {
if (nbtItem.has("ticks")) { int result = nbtItem.getInteger("ticks");
int result = nbtItem.getInt("ticks");
return result == -99 ? -1 : result; return result == -99 ? -1 : result;
} }