EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Entity Fix and Gradle changes

Browse Source
This commit is contained in:
MattBDev 2016-07-01 17:13:49 -04:00
parent b9ad75ad84
commit cf5d2a5e86
4 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Bukkit/build.gradle
View File

@ -1,6 +1,12 @@
repositories {
maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"}
maven { url = "https://oss.sonatype.org/content/repositories/snapshots/"}
maven {url "http://nexus.theyeticave.net/content/repositories/pub_releases"}
}
dependencies { dependencies {
compile project(':Core') compile project(':Core')
compile 'org.bukkit:Spigot:1.10' compile 'org.spigotmc:spigot-api:1.10.2-R0.1-SNAPSHOT'
compile 'org.mcstats.bukkit:metrics:R7' compile 'org.mcstats.bukkit:metrics:R7'
compile 'net.milkbowl.vault:VaultAPI:1.6' compile 'net.milkbowl.vault:VaultAPI:1.6'
} }
@ -17,19 +23,19 @@ processResources {
) )
} }
} }
apply plugin: 'com.github.johnrengelman.shadow'
// We only want the shadow jar produced // We only want the shadow jar produced
jar.enabled = false jar.enabled = false
shadowJar { shadowJar {
dependencies { dependencies {
include(dependency(':Core')) include(dependency(':Core'))
include(dependency('org.mcstats.bukkit:metrics:R7')) include(dependency('org.mcstats.bukkit:metrics:R7'))
} }
relocate 'org.mcstats', 'com.plotsquared.stats' relocate('org.mcstats', 'com.plotsquared.stats')
archiveName = "${parent.name}-${project.name}-${parent.version}.jar" archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
destinationDir = file '../target' destinationDir = file '../target'
} }
shadowJar.doLast { shadowJar.doLast {
task -> task ->
ant.checksum file: task.archivePath ant.checksum file: task.archivePath

64
Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
View File

@ -208,7 +208,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
Entity entity = iterator.next(); Entity entity = iterator.next();
switch (entity.getType()) { switch (entity.getType()) {
case EGG: case EGG:
case ENDER_CRYSTAL:
case COMPLEX_PART: case COMPLEX_PART:
case FISHING_HOOK: case FISHING_HOOK:
case ENDER_SIGNAL: case ENDER_SIGNAL:
@ -239,37 +238,39 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
// Not vehicles // Not vehicles
continue; continue;
case ARMOR_STAND: case ARMOR_STAND:
// Tempirarily classify as vehicle // Temporarily classify as vehicle
case MINECART: case MINECART:
case MINECART_CHEST: case MINECART_CHEST:
case MINECART_COMMAND: case MINECART_COMMAND:
case MINECART_FURNACE: case MINECART_FURNACE:
case MINECART_HOPPER: case MINECART_HOPPER:
case MINECART_MOB_SPAWNER: case MINECART_MOB_SPAWNER:
case ENDER_CRYSTAL:
case MINECART_TNT: case MINECART_TNT:
case BOAT: { case BOAT: {
if (!Settings.Enabled_Components.KILL_ROAD_VEHICLES) { if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
continue; com.intellectualcrafters.plot.object.Location location = BukkitUtil.getLocation(entity.getLocation());
} Plot plot = location.getPlot();
com.intellectualcrafters.plot.object.Location location = BukkitUtil.getLocation(entity.getLocation()); if (plot == null) {
Plot plot = location.getPlot(); if (location.isPlotArea()) {
if (plot == null) { iterator.remove();
if (location.isPlotArea()) { entity.remove();
}
continue;
}
List<MetadataValue> meta = entity.getMetadata("plot");
if (meta.isEmpty()) {
continue;
}
Plot origin = (Plot) meta.get(0).value();
if (!plot.equals(origin.getBasePlot(false))) {
iterator.remove(); iterator.remove();
entity.remove(); entity.remove();
} }
continue; continue;
} } else {
List<MetadataValue> meta = entity.getMetadata("plot");
if (meta.isEmpty()) {
continue; continue;
} }
Plot origin = (Plot) meta.get(0).value();
if (!plot.equals(origin.getBasePlot(false))) {
iterator.remove();
entity.remove();
}
continue;
} }
case SMALL_FIREBALL: case SMALL_FIREBALL:
case FIREBALL: case FIREBALL:
@ -316,26 +317,25 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
case ZOMBIE: case ZOMBIE:
case SHULKER: case SHULKER:
default: default:
if (!Settings.Enabled_Components.KILL_ROAD_MOBS) { if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
continue; Location location = entity.getLocation();
} if (BukkitUtil.getLocation(location).isPlotRoad()) {
Location location = entity.getLocation(); if (entity instanceof LivingEntity) {
if (BukkitUtil.getLocation(location).isPlotRoad()) { LivingEntity livingEntity = (LivingEntity) entity;
if (entity instanceof LivingEntity) { if (!livingEntity.isLeashed() || !entity.hasMetadata("keep")) {
LivingEntity livingEntity = (LivingEntity) entity; Entity passenger = entity.getPassenger();
if (!livingEntity.isLeashed() || !entity.hasMetadata("keep")) { if (!(passenger instanceof Player) && entity.getMetadata("keep").isEmpty()) {
iterator.remove();
entity.remove();
}
}
} else {
Entity passenger = entity.getPassenger(); Entity passenger = entity.getPassenger();
if (!(passenger instanceof Player) && entity.getMetadata("keep").isEmpty()) { if (!(passenger instanceof Player) && entity.getMetadata("keep").isEmpty()) {
iterator.remove(); iterator.remove();
entity.remove(); entity.remove();
} }
} }
} else {
Entity passenger = entity.getPassenger();
if (!(passenger instanceof Player) && entity.getMetadata("keep").isEmpty()) {
iterator.remove();
entity.remove();
}
} }
} }
} }

9
Sponge/build.gradle
View File

@ -15,7 +15,6 @@ buildscript {
} }
apply plugin: 'net.minecrell.vanilla.server.library' apply plugin: 'net.minecrell.vanilla.server.library'
apply plugin: 'com.github.johnrengelman.shadow'
dependencies { dependencies {
compile project(':Core') compile project(':Core')
@ -34,14 +33,10 @@ repositories {
name = "Sponge" name = "Sponge"
url = "https://repo.spongepowered.org/maven" url = "https://repo.spongepowered.org/maven"
} }
maven {
name = "Sponge Metrics"
url = "http://repo.mcstats.org/content/repositories/releases/"
}
} }
minecraft { minecraft {
version = "1.9.4" version = "1.10.2"
mappings = "snapshot_20160530" mappings = "snapshot_20160629"
runDir = 'run' runDir = 'run'
} }

7
build.gradle
View File

@ -3,9 +3,8 @@ import org.ajoberstar.grgit.Grgit
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url = "https://oss.sonatype.org/content/repositories/snapshots/"}
jcenter() jcenter()
mavenLocal()
} }
dependencies { dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3' classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
@ -27,6 +26,8 @@ subprojects {
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'com.github.johnrengelman.shadow'
dependencies { dependencies {
compile(group: 'com.sk89q.worldedit', name: 'worldedit-core', version:'6.1.3-SNAPSHOT') { compile(group: 'com.sk89q.worldedit', name: 'worldedit-core', version:'6.1.3-SNAPSHOT') {
@ -43,9 +44,7 @@ subprojects {
mavenCentral() mavenCentral()
maven {url "http://empcraft.com/maven2"} maven {url "http://empcraft.com/maven2"}
maven {url "http://repo.mcstats.org/content/repositories/public"} maven {url "http://repo.mcstats.org/content/repositories/public"}
maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"}
maven {url "http://maven.sk89q.com/repo/"} maven {url "http://maven.sk89q.com/repo/"}
maven {url "http://nexus.theyeticave.net/content/repositories/pub_releases"}
maven {url "http://repo.maven.apache.org/maven2"} maven {url "http://repo.maven.apache.org/maven2"}
} }
} }