Skip to content

Commit

Permalink
update to work with latest 1.13.2 revision, fixes #1855
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Dec 7, 2018
1 parent 5a21775 commit 2014256
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
22 changes: 11 additions & 11 deletions plugin/src/main/java/net/aufdemrand/denizen/utilities/maps/DenizenMapManager.java
View file
Expand Up @@ -23,7 +23,7 @@

public class DenizenMapManager {

private final static Map<Short, DenizenMapRenderer> mapRenderers = new HashMap<Short, DenizenMapRenderer>();
private final static Map<Integer, DenizenMapRenderer> mapRenderers = new HashMap<>();
private final static Map<String, String> downloadedByUrl = new HashMap<String, String>();
private final static File imagesFolder = new File(DenizenAPI.getCurrentInstance().getDataFolder(), "images");
private final static File imageDownloads = new File(imagesFolder, "downloaded");
Expand All @@ -34,8 +34,8 @@ public class DenizenMapManager {
private static YamlConfiguration mapsConfig;

public static void reloadMaps() {
Map<Short, List<MapRenderer>> oldMapRenderers = new HashMap<Short, List<MapRenderer>>();
for (Map.Entry<Short, DenizenMapRenderer> entry : mapRenderers.entrySet()) {
Map<Integer, List<MapRenderer>> oldMapRenderers = new HashMap<>();
for (Map.Entry<Integer, DenizenMapRenderer> entry : mapRenderers.entrySet()) {
DenizenMapRenderer renderer = entry.getValue();
oldMapRenderers.put(entry.getKey(), renderer.getOldRenderers());
renderer.deactivate();
Expand All @@ -48,8 +48,8 @@ public static void reloadMaps() {
return;
}
for (String key : mapsSection.getKeys(false)) {
short mapId = Short.valueOf(key);
MapView mapView = Bukkit.getServer().getMap(mapId);
int mapId = Integer.valueOf(key);
MapView mapView = Bukkit.getServer().getMap((short) mapId); // TODO: ??? (deprecated short method)
if (mapView == null) {
dB.echoError("Map #" + key + " does not exist. Has it been removed? Deleting from maps.yml...");
mapsSection.set(key, null);
Expand All @@ -69,7 +69,7 @@ public static void reloadMaps() {
DenizenMapRenderer renderer = new DenizenMapRenderer(oldRenderers,
mapsSection.getBoolean(key + ".auto update", false));
renderer.displayOriginal = mapsSection.getBoolean(key + ".original", true);
List<String> objects = new ArrayList<String>(objectsData.getKeys(false));
List<String> objects = new ArrayList<>(objectsData.getKeys(false));
Collections.sort(objects, new NaturalOrderComparator());
for (String objectKey : objects) {
String type = objectsData.getString(objectKey + ".type").toUpperCase();
Expand Down Expand Up @@ -107,10 +107,10 @@ else if (type.equals("TEXT")) {
mapView.addRenderer(renderer);
mapRenderers.put(mapId, renderer);
}
for (Map.Entry<Short, List<MapRenderer>> entry : oldMapRenderers.entrySet()) {
short id = entry.getKey();
for (Map.Entry<Integer, List<MapRenderer>> entry : oldMapRenderers.entrySet()) {
int id = entry.getKey();
if (!mapRenderers.containsKey(id)) {
MapView mapView = Bukkit.getServer().getMap(id);
MapView mapView = Bukkit.getServer().getMap((short) id); // TODO: ??? (deprecated short method)
if (mapView != null) {
for (MapRenderer renderer : entry.getValue()) {
mapView.addRenderer(renderer);
Expand All @@ -129,7 +129,7 @@ else if (type.equals("TEXT")) {
}

public static void saveMaps() {
for (Map.Entry<Short, DenizenMapRenderer> entry : mapRenderers.entrySet()) {
for (Map.Entry<Integer, DenizenMapRenderer> entry : mapRenderers.entrySet()) {
if (entry.getValue().isActive()) {
mapsConfig.set("MAPS." + entry.getKey(), entry.getValue().getSaveData());
}
Expand All @@ -155,7 +155,7 @@ public static void setMap(MapView map, DenizenMapRenderer denizenMapRenderer) {
}

public static DenizenMapRenderer getDenizenRenderer(MapView map) {
short mapId = map.getId();
int mapId = map.getId();
DenizenMapRenderer dmr;
if (!mapRenderers.containsKey(mapId)) {
dmr = new DenizenMapRenderer(map.getRenderers(), false);
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/net/aufdemrand/denizen/nms/impl/entities/EntityItemProjectile_v1_13_R2.java
View file
Expand Up @@ -88,8 +88,8 @@ else if (this.aw-- <= 0) {
}

if (movingobjectposition != null) {
if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.NETHER_PORTAL) {
this.e(movingobjectposition.a());
if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.getBlockPosition()).getBlock() == Blocks.NETHER_PORTAL) {
this.e(movingobjectposition.getBlockPosition());
}
else {
this.a(movingobjectposition);
Expand Down
12 changes: 6 additions & 6 deletions v1_13_R2/src/main/java/net/aufdemrand/denizen/nms/impl/jnbt/CompoundTag_v1_13_R2.java
View file
Expand Up @@ -72,13 +72,13 @@ public static CompoundTag fromNMSTag(NBTTagCompound tag) {
for (String key : tag.getKeys()) {
NBTBase base = tag.get(key);
if (base instanceof NBTTagInt) {
tags.put(key, new IntTag(((NBTTagInt) base).e()));
tags.put(key, new IntTag(((NBTTagInt) base).asInt()));
}
else if (base instanceof NBTTagByte) {
tags.put(key, new ByteTag(((NBTTagByte) base).g()));
tags.put(key, new ByteTag(((NBTTagByte) base).asByte()));
}
else if (base instanceof NBTTagFloat) {
tags.put(key, new FloatTag(((NBTTagFloat) base).i()));
tags.put(key, new FloatTag(((NBTTagFloat) base).asFloat()));
}
else if (base instanceof NBTTagDouble) {
tags.put(key, new DoubleTag(((NBTTagDouble) base).asDouble()));
Expand All @@ -96,13 +96,13 @@ else if (base instanceof NBTTagEnd) {
tags.put(key, new EndTag());
}
else if (base instanceof NBTTagLong) {
tags.put(key, new LongTag(((NBTTagLong) base).d()));
tags.put(key, new LongTag(((NBTTagLong) base).asLong()));
}
else if (base instanceof NBTTagShort) {
tags.put(key, new ShortTag(((NBTTagShort) base).f()));
tags.put(key, new ShortTag(((NBTTagShort) base).asShort()));
}
else if (base instanceof NBTTagString) {
tags.put(key, new StringTag(((NBTTagString) base).b_()));
tags.put(key, new StringTag(((NBTTagString) base).asString()));
}
else if (base instanceof NBTTagList) {
NBTTagList list = (NBTTagList) base;
Expand Down

0 comments on commit 2014256

Please sign in to comment.