Upstream
/
Brewery
mirror of https://github.com/DieReicheErethons/Brewery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #408 from TheBusyBiscuit/update/slimefun 

Updated Slimefun integration
This commit is contained in:
Sn0wStorm 2021-06-07 13:58:15 +02:00 committed by GitHub
parent 3166f8c81b 4d01fe4b91
commit 323e19eac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -252,9 +252,9 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.TheBusyBiscuit</groupId> <groupId>com.github.slimefun</groupId>
<artifactId>Slimefun4</artifactId> <artifactId>Slimefun4</artifactId>
<version>RC-21</version> <version>RC-22</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--<dependency> <!--<dependency>

4
src/com/dre/brewery/integration/item/SlimefunPluginItem.java
View File

@ -23,9 +23,9 @@ public class SlimefunPluginItem extends PluginItem {
try { try {
SlimefunItem sfItem = SlimefunItem.getByItem(item); SlimefunItem sfItem = SlimefunItem.getByItem(item);
if (sfItem != null) { if (sfItem != null) {
return sfItem.getID().equalsIgnoreCase(getItemId()); return sfItem.getId().equalsIgnoreCase(getItemId());
} }
} catch (Throwable e) { } catch (Exception | LinkageError e) {
e.printStackTrace(); e.printStackTrace();
P.p.errorLog("Could not check Slimefun for Item ID"); P.p.errorLog("Could not check Slimefun for Item ID");
BConfig.hasSlimefun = false; BConfig.hasSlimefun = false;