From def5f2155d6517afd3c5c0c31b11ad933b4547b6 Mon Sep 17 00:00:00 2001 From: pop4959 Date: Thu, 20 Aug 2020 11:24:42 -0700 Subject: [PATCH 1/4] Fix compilation issues on latest Spigot/Paper (#3607) --- .../src/com/earth2me/essentials/craftbukkit/FakeWorld.java | 5 +++++ providers/PaperProvider/pom.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java index 4665d76c3..fec2763d1 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java +++ b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java @@ -276,6 +276,11 @@ public class FakeWorld implements World { throw new UnsupportedOperationException("Not supported yet."); } + @Override + public boolean setSpawnLocation(int i, int i1, int i2, float v) { + throw new UnsupportedOperationException("Not supported yet."); + } + @Override public boolean setSpawnLocation(int i, int i1, int i2) { throw new UnsupportedOperationException("Not supported yet."); diff --git a/providers/PaperProvider/pom.xml b/providers/PaperProvider/pom.xml index 0307d6c46..aeaf38a65 100644 --- a/providers/PaperProvider/pom.xml +++ b/providers/PaperProvider/pom.xml @@ -28,7 +28,7 @@ com.destroystokyo.paper paper-api - 1.15.2-R0.1-SNAPSHOT + 1.16.1-R0.1-SNAPSHOT From 6875fa4c7e0910a6be6515c562056578669bd0f8 Mon Sep 17 00:00:00 2001 From: triagonal Date: Fri, 21 Aug 2020 23:00:18 +1000 Subject: [PATCH 2/4] fix blacklisted blocks being pulled by sticky piston --- .../essentials/antibuild/EssentialsAntiBuildListener.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java index c12cd4735..3e626013d 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java @@ -277,9 +277,11 @@ public class EssentialsAntiBuildListener implements Listener { if (!event.isSticky()) { return; } - final Block block = event.getBlock(); - if (prot.checkProtectionItems(AntiBuildConfig.blacklist_piston, block.getType())) { - event.setCancelled(true); + for (Block block : event.getBlocks()) { + if (prot.checkProtectionItems(AntiBuildConfig.blacklist_piston, block.getType())) { + event.setCancelled(true); + return; + } } } From bd1e624c916471006f787009aeb27a176edcdead Mon Sep 17 00:00:00 2001 From: triagonal Date: Fri, 21 Aug 2020 23:00:56 +1000 Subject: [PATCH 3/4] clarify piston blacklist config comment --- Essentials/src/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 1e9973dbd..98136f01f 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -992,7 +992,7 @@ protect: # Which blocks should people be prevented from breaking? break: - # Which blocks should not be pushed by pistons? + # Which blocks should not be moved by pistons? piston: # Which blocks should not be dispensed by dispensers From 1133770aeb8913d31c1ec24e6dbc863d9a5a5625 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Fri, 21 Aug 2020 11:37:54 -0400 Subject: [PATCH 4/4] Fix changing players' gamemodes from the console (#3590) Fixes #3587 which was introduced by #3337. --- .../src/com/earth2me/essentials/commands/Commandgamemode.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java index 13506b1cf..fa9f07476 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java @@ -26,7 +26,7 @@ public class Commandgamemode extends EssentialsLoopCommand { } else if (args.length == 1) { loopOnlinePlayersConsumer(server, sender, false, true, args[0], user -> setUserGamemode(sender, matchGameMode(commandLabel), user)); } else if (args.length == 2) { - loopOnlinePlayersConsumer(server, sender, false, true, args[1], user -> setUserGamemode(sender, matchGameMode(commandLabel), user)); + loopOnlinePlayersConsumer(server, sender, false, true, args[1], user -> setUserGamemode(sender, matchGameMode(args[0]), user)); } } @@ -85,6 +85,7 @@ public class Commandgamemode extends EssentialsLoopCommand { private GameMode matchGameMode(String modeString) throws NotEnoughArgumentsException { GameMode mode = null; + modeString = modeString.toLowerCase(); if (modeString.equalsIgnoreCase("gmc") || modeString.equalsIgnoreCase("egmc") || modeString.contains("creat") || modeString.equalsIgnoreCase("1") || modeString.equalsIgnoreCase("c")) { mode = GameMode.CREATIVE; } else if (modeString.equalsIgnoreCase("gms") || modeString.equalsIgnoreCase("egms") || modeString.contains("survi") || modeString.equalsIgnoreCase("0") || modeString.equalsIgnoreCase("s")) {