Upstream/Brewery
1
0
Fork 0
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2024-06-24 10:04:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Sealing Table Shiftclick #401

Browse Source 
& Updated Dependencies
This commit is contained in:
Sn0wStorm 2021-06-07 16:47:24 +02:00
parent ea9d1dfc5b
commit fe637b9572
4 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -9,6 +9,10 @@ Find the Project Page on [Spigot](https://www.spigotmc.org/resources/brewery.308
Also see [Wiki](https://github.com/DieReicheErethons/Brewery/wiki) | [Releases](https://github.com/DieReicheErethons/Brewery/releases) | [Changelog](https://github.com/DieReicheErethons/Brewery/wiki/changelog) | [Commits](https://github.com/DieReicheErethons/Brewery/commits/master)
### JavaDoc
https://javadoc.jitpack.io/com/github/DieReicheErethons/Brewery/-3166f8c81b-1/javadoc/index.html
### Maven
```XML

39
pom.xml
View File

@ -161,6 +161,13 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- https://bstats.org/getting-started/include-metrics -->
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>2.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
@ -186,9 +193,10 @@
</exclusions>
</dependency>
<dependency>
<!-- https://dev.bukkit.org/projects/worldedit/files -->
<groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-bukkit</artifactId>
<version>7.2.4</version>
<version>7.2.5</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@ -200,7 +208,7 @@
<dependency>
<groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-core</artifactId>
<version>7.2.3</version>
<version>7.2.5</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@ -210,6 +218,7 @@
</exclusions>
</dependency>
<dependency>
<!-- https://dev.bukkit.org/projects/worldguard/files -->
<groupId>com.sk89q.worldguard</groupId>
<artifactId>worldguard-core</artifactId>
<version>7.0.4</version>
@ -222,6 +231,7 @@
</exclusions>
</dependency>
<dependency>
<!-- https://www.spigotmc.org/resources/lwc-extended.69551/history -->
<groupId>com.griefcraft.lwc</groupId>
<artifactId>LWCX</artifactId>
<version>2.2.6</version>
@ -234,15 +244,17 @@
</exclusions>
</dependency>
<dependency>
<!-- https://www.spigotmc.org/resources/griefprevention.1884/history -->
<groupId>com.github.TechFortress</groupId>
<artifactId>GriefPrevention</artifactId>
<version>16.17.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- https://www.spigotmc.org/resources/logblock.67333/history -->
<groupId>de.diddiz</groupId>
<artifactId>logblock</artifactId>
<version>1.16.1.1</version>
<version>1.16.5.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@ -252,9 +264,10 @@
</exclusions>
</dependency>
<dependency>
<!-- https://github.com/Slimefun/Slimefun4/releases -->
<groupId>com.github.slimefun</groupId>
<artifactId>Slimefun4</artifactId>
<version>RC-22</version>
<version>RC-24</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
@ -265,42 +278,42 @@
<scope>provided</scope>
</dependency>-->
<dependency>
<!-- https://mythiccraft.io/index.php?pages/official-mythiclib-dev/ -->
<groupId>io.lumine</groupId>
<artifactId>MythicLib</artifactId>
<version>1.0.18</version>
<version>1.0.19</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- https://github.com/ChestShop-authors/ChestShop-3/releases -->
<groupId>com.acrobot.chestshop</groupId>
<artifactId>chestshop</artifactId>
<version>3.11</version>
<version>3.12</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- https://www.spigotmc.org/resources/towny-advanced.72694/history -->
<groupId>com.github.TownyAdvanced</groupId>
<artifactId>Towny</artifactId>
<version>0.96.3.0</version>
<version>0.97.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- https://www.spigotmc.org/resources/shopkeepers.80756/history -->
<groupId>com.nisovin.shopkeepers</groupId>
<artifactId>ShopkeepersAPI</artifactId>
<version>2.12.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- https://www.spigotmc.org/resources/blocklocker.3268/history -->
<groupId>nl.rutgerkok</groupId>
<artifactId>blocklocker</artifactId>
<version>1.9.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>2.2.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<!-- https://www.jetbrains.com/help/idea/annotating-source-code.html -->
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>16.0.2</version>

2
src/com/dre/brewery/P.java
View File

@ -422,7 +422,7 @@ public class P extends JavaPlugin {
}
}
}));
} catch (Throwable e) {
} catch (Exception | LinkageError e) {
e.printStackTrace();
}
}

26
src/com/dre/brewery/listeners/PlayerListener.java
View File

@ -11,6 +11,7 @@ import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
@ -50,19 +51,12 @@ public class PlayerListener implements Listener {
return;
}
if (player.isSneaking()) return;
// -- Interacting with a Cauldron --
if (type == Material.CAULDRON) {
// Handle the Cauldron Interact
// The Event might get cancelled in here
BCauldron.clickCauldron(event);
return;
}
// -- Opening a Sealing Table --
if (P.use1_14 && BSealer.isBSealer(clickedBlock)) {
if (player.isSneaking()) {
event.setUseInteractedBlock(Event.Result.DENY);
return;
}
event.setCancelled(true);
if (BConfig.enableSealingTable) {
BSealer sealer = new BSealer(player);
@ -73,6 +67,16 @@ public class PlayerListener implements Listener {
return;
}
if (player.isSneaking()) return;
// -- Interacting with a Cauldron --
if (type == Material.CAULDRON) {
// Handle the Cauldron Interact
// The Event might get cancelled in here
BCauldron.clickCauldron(event);
return;
}
// -- Opening a Minecraft Barrel --
if (P.use1_14 && type == Material.BARREL) {
if (!player.hasPermission("brewery.openbarrel.mc")) {