SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Shulker disguises are allowed to move in 1.17+, fixes #584"

Browse Source 
This reverts commit 7e21f20120.

# Conflicts:
#	src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
This commit is contained in:
libraryaddict 2021-09-04 21:55:37 +12:00
parent 8bca0f037d
commit 7b3046755c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java
View File

@ -20,7 +20,6 @@ import me.libraryaddict.disguise.utilities.LibsEntityInteract;
import me.libraryaddict.disguise.utilities.LibsPremium; import me.libraryaddict.disguise.utilities.LibsPremium;
import me.libraryaddict.disguise.utilities.modded.ModdedEntity; import me.libraryaddict.disguise.utilities.modded.ModdedEntity;
import me.libraryaddict.disguise.utilities.modded.ModdedManager; import me.libraryaddict.disguise.utilities.modded.ModdedManager;
import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
import me.libraryaddict.disguise.utilities.translations.LibsMsg; import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -530,7 +529,7 @@ public class DisguiseListener implements Listener {
DisguiseUtilities.doBoundingBox((TargetedDisguise) disguise); DisguiseUtilities.doBoundingBox((TargetedDisguise) disguise);
} }
if (!NmsVersion.v1_17.isSupported() && DisguiseConfig.isStopShulkerDisguisesFromMoving()) { if (DisguiseConfig.isStopShulkerDisguisesFromMoving()) {
Disguise disguise; Disguise disguise;
if ((disguise = DisguiseAPI.getDisguise(event.getPlayer())) != null) { if ((disguise = DisguiseAPI.getDisguise(event.getPlayer())) != null) {

1
src/main/resources/configs/sanity.yml
View File

@ -1,7 +1,6 @@
# This config is called sanity, because you shouldn't need to change the stuff in here # This config is called sanity, because you shouldn't need to change the stuff in here
#Stop shulker disguises from moving, they're weird. This option only effects PLAYERS that are disguised, other entities disguised as shulkers will NOT be effected! #Stop shulker disguises from moving, they're weird. This option only effects PLAYERS that are disguised, other entities disguised as shulkers will NOT be effected!
# This is ignored in 1.17+ as its fixed in those versions
StopShulkerDisguisesFromMoving: true StopShulkerDisguisesFromMoving: true
# This means that the plugin doesn't need to constantly call Mojang just to find a skin for an offline player # This means that the plugin doesn't need to constantly call Mojang just to find a skin for an offline player