Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-03-01 15:51:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed updater errors, this build should load.

Browse Source
This commit is contained in:
Ethan 2020-09-16 04:25:27 -04:00
parent 25f738f80c
commit 2e489d6f30
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/Indyuce/mmoitems/api/UpdaterData.java
View File

@ -21,7 +21,10 @@ public class UpdaterData {
* they don't match, the item needs to be updated. UUID not final because it
* must be changed
*/
private final MMOItemTemplate template;
private final Type type;
private final String id;
private UUID uuid;
@ -36,7 +39,8 @@ public class UpdaterData {
}
public UpdaterData(MMOItemTemplate template, UUID uuid, KeepOption... options) {
this.template = template;
this.id = template.getId();
this.type = template.getType();
this.uuid = uuid;
this.options.addAll(Arrays.asList(options));
}
@ -56,15 +60,15 @@ public class UpdaterData {
}
public String getPath() {
return template.getType().getId() + "." + template.getId();
return type.getId() + "." + id;
}
public Type getType() {
return template.getType();
return type;
}
public String getId() {
return template.getId();
return id;
}
public UUID getUniqueId() {

23
src/main/java/net/Indyuce/mmoitems/manager/UpdaterManager.java
View File

@ -39,9 +39,11 @@ public class UpdaterManager implements Listener {
for (String typeFormat : config.getKeys(false))
try {
Type type = MMOItems.plugin.getTypes().getOrThrow(typeFormat);
for (String id : config.getConfigurationSection(typeFormat).getKeys(false))
enable(new UpdaterData(MMOItems.plugin.getTemplates().getTemplate(type, id), config.getConfigurationSection(typeFormat + "." + id)));
} catch (IllegalArgumentException exception) {
for (String id : config.getConfigurationSection(typeFormat).getKeys(false)) {
MMOItemTemplate template = MMOItems.plugin.getTemplates().getTemplateOrThrow(type, id);
enable(new UpdaterData(template, config.getConfigurationSection(typeFormat + "." + id)));
}
} catch (IllegalArgumentException | NullPointerException exception) {
MMOItems.plugin.getLogger().log(Level.WARNING,
"An issue occurred while trying to load dynamic updater data: " + exception.getMessage());
}
@ -116,11 +118,6 @@ public class UpdaterManager implements Listener {
}
public ItemStack getUpdated(ItemStack item, Player target) {
if (item == null) {
return null;
}
if (item.getType() == Material.AIR)
return item;
return getUpdated(MMOLib.plugin.getVersion().getWrapper().getNBTItem(item), target);
}
@ -130,10 +127,12 @@ public class UpdaterManager implements Listener {
* If the item type is null, then it is not an mmoitem and it does not
* need to be updated
*/
if (item.getType() == null)
Type type = item.getType();
if (type == null)
return item.getItem();
if (!data.hasValue(item.getType(), item.getString("MMOITEMS_ITEM_ID")))
if (!data.hasValue(type, item.getString("MMOITEMS_ITEM_ID")))
return item.getItem();
@ -141,11 +140,11 @@ public class UpdaterManager implements Listener {
* check the internal UUID of the item, if it does not make the one
* stored in the item updater data then the item is outdated.
*/
UpdaterData did = data.getValue(item.getType(), item.getString("MMOITEMS_ITEM_ID"));
UpdaterData did = data.getValue(type, item.getString("MMOITEMS_ITEM_ID"));
if (did.matches(item))
return item.getItem();
MMOItemTemplate template = MMOItems.plugin.getTemplates().getTemplate(item.getType(), item.getString("MMOITEMS_ITEM_ID"));
MMOItemTemplate template = MMOItems.plugin.getTemplates().getTemplate(type, item.getString("MMOITEMS_ITEM_ID"));
MMOItem newMMOItem = template.newBuilder(PlayerData.get(target).getRPG()).build();
/*