Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2025-02-03 05:01:27 +01:00
Code Issues Projects Releases Wiki Activity

Fixes for AnvilView, WildStacker and mcMMO.

Browse Source
This commit is contained in:
Fernando Pettinelli 2022-07-13 01:49:36 -04:00
parent 2b7cfcc29a
commit c8be1229e8
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/main/java/com/songoda/core/hooks/mcmmo/McMMOHandler.java
View File

@ -17,6 +17,7 @@ import org.bukkit.block.Block;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.permissions.Permissible;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
@ -59,7 +60,7 @@ public class McMMOHandler {
mcmmo_PerksUtils_handleLuckyPerks = mcmmo_PerksUtils.getDeclaredMethod("handleLuckyPerks", Player.class, mcmmo_SkillType); mcmmo_PerksUtils_handleLuckyPerks = mcmmo_PerksUtils.getDeclaredMethod("handleLuckyPerks", Player.class, mcmmo_SkillType);
mcmmo_SecondaryAbility = Class.forName("com.gmail.nossr50.datatypes.skills.SecondaryAbility"); mcmmo_SecondaryAbility = Class.forName("com.gmail.nossr50.datatypes.skills.SecondaryAbility");
mcmmo_SecondaryAbility_valueOf = mcmmo_SecondaryAbility.getDeclaredMethod("valueOf", String.class); mcmmo_SecondaryAbility_valueOf = mcmmo_SecondaryAbility.getDeclaredMethod("valueOf", String.class);
mcmmo_Permissions_secondaryAbilityEnabled = com.gmail.nossr50.util.Permissions.class.getDeclaredMethod("secondaryAbilityEnabled", Player.class, mcmmo_SecondaryAbility); mcmmo_Permissions_secondaryAbilityEnabled = com.gmail.nossr50.util.Permissions.class.getDeclaredMethod("secondaryAbilityEnabled", Permissible.class, mcmmo_SecondaryAbility);
mcmmo_SkillUtils_activationSuccessful = com.gmail.nossr50.util.skills.SkillUtils.class.getDeclaredMethod("activationSuccessful", mcmmo_SecondaryAbility, Player.class, int.class, int.class); mcmmo_SkillUtils_activationSuccessful = com.gmail.nossr50.util.skills.SkillUtils.class.getDeclaredMethod("activationSuccessful", mcmmo_SecondaryAbility, Player.class, int.class, int.class);
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) {

17
Core/src/main/java/com/songoda/core/hooks/stackers/WildStacker.java
View File

@ -1,17 +1,20 @@
package com.songoda.core.hooks.stackers; package com.songoda.core.hooks.stackers;
import com.bgsoftware.wildstacker.WildStackerPlugin;
import com.bgsoftware.wildstacker.api.WildStackerAPI; import com.bgsoftware.wildstacker.api.WildStackerAPI;
import com.bgsoftware.wildstacker.api.enums.SpawnCause;
import com.bgsoftware.wildstacker.api.objects.StackedEntity; import com.bgsoftware.wildstacker.api.objects.StackedEntity;
import com.bgsoftware.wildstacker.utils.GeneralUtils;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
public class WildStacker extends Stacker { public class WildStacker extends Stacker {
final Plugin plugin; private final WildStackerPlugin plugin;
public WildStacker(Plugin plugin) { public WildStacker() {
this.plugin = plugin; this.plugin = WildStackerPlugin.getPlugin();
} }
@Override @Override
@ -68,12 +71,6 @@ public class WildStacker extends Stacker {
@Override @Override
public int getMinStackSize(EntityType type) { public int getMinStackSize(EntityType type) {
int min = plugin.getConfig().getInt("entities.minimum-limits." + type.name(), -1); return plugin.getSettings().minimumRequiredEntities.getOrDefault(type, SpawnCause.DEFAULT, 0);
if (min == -1) {
min = plugin.getConfig().getInt("entities.minimum-limits.all", -1);
}
return min == -1 ? 0 : min;
} }
} }

2
NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/anvil/AnvilView.java
View File

@ -142,7 +142,7 @@ public class AnvilView extends AnvilMenu implements CustomAnvil {
this.customTitle = title; this.customTitle = title;
try { try {
mc_Container_title.set(this, new TranslatableComponent(customTitle != null ? customTitle : "")); mc_Container_title.set(this, MutableComponent.create(new TranslatableContents(customTitle != null ? customTitle : "")));
} catch (Exception ex) { } catch (Exception ex) {
Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Error", ex); Logger.getLogger(AnvilView.class.getName()).log(Level.SEVERE, "Anvil Error", ex);
} }