Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-05 02:19:30 +01:00
Code Issues Projects Releases Wiki Activity

Bump dependencies.

Browse Source 
Also remove intake. Unsure when that was ever used.
This commit is contained in:
wizjany 2019-06-13 08:53:49 -04:00
parent 9cf1e02506
commit fe4f0cfc49
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldguard-bukkit/build.gradle
View File

@ -11,7 +11,7 @@
dependencies { dependencies {
compile project(path: ':worldguard-core', configuration: 'shadow') compile project(path: ':worldguard-core', configuration: 'shadow')
api 'org.bukkit:bukkit:1.13-R0.1-SNAPSHOT' api 'org.bukkit:bukkit:1.13-R0.1-SNAPSHOT'
api ('com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT') { api ('com.sk89q.worldedit:worldedit-bukkit:7.0.1-SNAPSHOT') {
exclude group: 'io.papermc', module: 'paperlib' exclude group: 'io.papermc', module: 'paperlib'
} }
implementation ('com.sk89q:commandbook:2.3') { implementation ('com.sk89q:commandbook:2.3') {
@ -20,7 +20,7 @@ compile project(path: ':worldguard-core', configuration: 'shadow')
exclude group: 'org.bukkit' exclude group: 'org.bukkit'
exclude group: 'net.sf.opencsv' exclude group: 'net.sf.opencsv'
} }
implementation 'org.bstats:bstats-bukkit:1.4' implementation 'org.bstats:bstats-bukkit:1.5'
} }
processResources { processResources {
@ -44,7 +44,7 @@ compile project(path: ':worldguard-core', configuration: 'shadow')
dependencies { dependencies {
include(dependency(':worldguard-core')) include(dependency(':worldguard-core'))
relocate ("org.bstats", "com.sk89q.worldguard.bukkit.bstats") { relocate ("org.bstats", "com.sk89q.worldguard.bukkit.bstats") {
include(dependency("org.bstats:bstats-bukkit:1.4")) include(dependency("org.bstats:bstats-bukkit:1.5"))
} }
} }

1
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View File

@ -70,7 +70,6 @@
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.FallingBlock; import org.bukkit.entity.FallingBlock;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
import org.bukkit.entity.LingeringPotion;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.ThrownPotion; import org.bukkit.entity.ThrownPotion;

3
worldguard-core/build.gradle
View File

@ -2,8 +2,7 @@
apply plugin: 'idea' apply plugin: 'idea'
dependencies { dependencies {
api 'com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT' api 'com.sk89q.worldedit:worldedit-core:7.0.1-SNAPSHOT'
implementation 'com.sk89q.intake:intake:4.2-SNAPSHOT'
implementation 'com.sk89q:squirrelid:0.2.0' implementation 'com.sk89q:squirrelid:0.2.0'
implementation 'org.flywaydb:flyway-core:3.0' implementation 'org.flywaydb:flyway-core:3.0'
implementation 'org.khelekore:prtree:1.5.0' implementation 'org.khelekore:prtree:1.5.0'

2
worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java
View File

@ -24,8 +24,6 @@
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.sk89q.worldguard.protection.flags.Flag; import com.sk89q.worldguard.protection.flags.Flag;
import com.sk89q.worldguard.protection.flags.Flags; import com.sk89q.worldguard.protection.flags.Flags;
import com.sk89q.worldguard.protection.flags.RegionGroup;
import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Collection; import java.util.Collection;