1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00

Remove old compat change

This commit is contained in:
Daniel Walsh 2021-06-03 12:33:00 +01:00
parent 11b20b2744
commit cb22ab7eb7
No known key found for this signature in database
GPG Key ID: 91C6D8D7C4011D82
2 changed files with 3 additions and 6 deletions

View File

@ -256,11 +256,8 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon {
PaperLib.suggestPaper(this); PaperLib.suggestPaper(this);
} }
// Disabling backwards-compatibility for fresh Slimefun installs // If the server has no "data-storage" folder, it's _probably_ a new install. So mark it for metrics.
if (!new File("data-storage/Slimefun").exists()) { if (!new File("data-storage/Slimefun").exists()) {
config.setValue("options.backwards-compatibility", false);
config.save();
isNewlyInstalled = true; isNewlyInstalled = true;
} }

View File

@ -305,7 +305,7 @@ public class SlimefunItem implements Placeable {
* @return An {@link Optional} describing the result * @return An {@link Optional} describing the result
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> @Nonnull Optional<ItemSetting<T>> getItemSetting(@Nonnull String key, @Nonnull Class<T> c) { public @Nonnull <T> Optional<ItemSetting<T>> getItemSetting(@Nonnull String key, @Nonnull Class<T> c) {
for (ItemSetting<?> setting : itemSettings) { for (ItemSetting<?> setting : itemSettings) {
if (setting.getKey().equals(key) && setting.isType(c)) { if (setting.getKey().equals(key) && setting.isType(c)) {
return Optional.of((ItemSetting<T>) setting); return Optional.of((ItemSetting<T>) setting);