diff --git a/libs/craftbukkit111.jar b/libs/craftbukkit111.jar new file mode 100644 index 0000000..7b59aec Binary files /dev/null and b/libs/craftbukkit111.jar differ diff --git a/libs/craftbukkit188.jar b/libs/craftbukkit188.jar deleted file mode 100644 index 43327c8..0000000 Binary files a/libs/craftbukkit188.jar and /dev/null differ diff --git a/src/com/cnaude/chairs/vehiclearrow/v1_8_R3/CraftChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/v1_11_R1/CraftChairsArrow.java similarity index 59% rename from src/com/cnaude/chairs/vehiclearrow/v1_8_R3/CraftChairsArrow.java rename to src/com/cnaude/chairs/vehiclearrow/v1_11_R1/CraftChairsArrow.java index 86768eb..1b9b09a 100644 --- a/src/com/cnaude/chairs/vehiclearrow/v1_8_R3/CraftChairsArrow.java +++ b/src/com/cnaude/chairs/vehiclearrow/v1_11_R1/CraftChairsArrow.java @@ -1,39 +1,28 @@ -package com.cnaude.chairs.vehiclearrow.v1_8_R3; - -import net.minecraft.server.v1_8_R3.EntityArrow; - -import org.bukkit.craftbukkit.v1_8_R3.CraftServer; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftArrow; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Player; -import org.bukkit.entity.Vehicle; - -import com.cnaude.chairs.api.ChairsAPI; - -public class CraftChairsArrow extends CraftArrow implements Vehicle { - - public CraftChairsArrow(CraftServer server, EntityArrow entity) { - super(server, entity); - } - - @Override - public void remove() { - Entity passenger = getPassenger(); - if (passenger != null && passenger instanceof Player) { - if (ChairsAPI.isSitting((Player) passenger)) { - return; - } - } - super.remove(); - } - - @Override - public boolean isGlowing() { - return false; - } - - @Override - public void setGlowing(boolean glowing) { - } - -} +package com.cnaude.chairs.vehiclearrow.v1_11_R1; + +import com.cnaude.chairs.api.ChairsAPI; +import net.minecraft.server.v1_11_R1.EntityArrow; +import org.bukkit.craftbukkit.v1_11_R1.CraftServer; +import org.bukkit.craftbukkit.v1_11_R1.entity.CraftArrow; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.entity.Vehicle; + +public class CraftChairsArrow extends CraftArrow implements Vehicle { + + public CraftChairsArrow(CraftServer server, EntityArrow entity) { + super(server, entity); + } + + @Override + public void remove() { + Entity passenger = getPassenger(); + if (passenger != null && passenger instanceof Player) { + if (ChairsAPI.isSitting((Player) passenger)) { + return; + } + } + super.remove(); + } + +} diff --git a/src/com/cnaude/chairs/vehiclearrow/v1_8_R3/NMSArrowFactory.java b/src/com/cnaude/chairs/vehiclearrow/v1_11_R1/NMSArrowFactory.java similarity index 73% rename from src/com/cnaude/chairs/vehiclearrow/v1_8_R3/NMSArrowFactory.java rename to src/com/cnaude/chairs/vehiclearrow/v1_11_R1/NMSArrowFactory.java index 7884a47..f58f5ea 100644 --- a/src/com/cnaude/chairs/vehiclearrow/v1_8_R3/NMSArrowFactory.java +++ b/src/com/cnaude/chairs/vehiclearrow/v1_11_R1/NMSArrowFactory.java @@ -1,12 +1,10 @@ -package com.cnaude.chairs.vehiclearrow.v1_8_R3; - -import net.minecraft.server.v1_8_R3.EntityArrow; - -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; -import org.bukkit.entity.Arrow; +package com.cnaude.chairs.vehiclearrow.v1_11_R1; import com.cnaude.chairs.vehiclearrow.NMSArrowFactoryInterface; +import net.minecraft.server.v1_11_R1.EntityArrow; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_11_R1.CraftWorld; +import org.bukkit.entity.Arrow; public class NMSArrowFactory implements NMSArrowFactoryInterface { diff --git a/src/com/cnaude/chairs/vehiclearrow/v1_8_R3/NMSChairsArrow.java b/src/com/cnaude/chairs/vehiclearrow/v1_11_R1/NMSChairsArrow.java similarity index 56% rename from src/com/cnaude/chairs/vehiclearrow/v1_8_R3/NMSChairsArrow.java rename to src/com/cnaude/chairs/vehiclearrow/v1_11_R1/NMSChairsArrow.java index ac17500..04119a6 100644 --- a/src/com/cnaude/chairs/vehiclearrow/v1_8_R3/NMSChairsArrow.java +++ b/src/com/cnaude/chairs/vehiclearrow/v1_11_R1/NMSChairsArrow.java @@ -1,23 +1,21 @@ -package com.cnaude.chairs.vehiclearrow.v1_8_R3; - -import net.minecraft.server.v1_8_R3.EntityArrow; - -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_8_R3.CraftServer; -import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; - -public class NMSChairsArrow extends EntityArrow { - - public NMSChairsArrow(CraftWorld cworld, Location location) { - super(cworld.getHandle()); - setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); - world.addEntity(this); - bukkitEntity = new CraftChairsArrow((CraftServer) Bukkit.getServer(), this); - } - - @Override - public void t_() { - } - -} +package com.cnaude.chairs.vehiclearrow.v1_11_R1; + +import net.minecraft.server.v1_11_R1.EntityTippedArrow; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_11_R1.CraftServer; +import org.bukkit.craftbukkit.v1_11_R1.CraftWorld; + +public class NMSChairsArrow extends EntityTippedArrow { + + public NMSChairsArrow(CraftWorld cworld, Location location) { + super(cworld.getHandle()); + setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); + world.addEntity(this); + bukkitEntity = new CraftChairsArrow((CraftServer) Bukkit.getServer(), this); + } + + @Override + public void A_() { + } +} diff --git a/src/config.yml b/src/config.yml index 2ebd0cf..215be14 100644 --- a/src/config.yml +++ b/src/config.yml @@ -26,6 +26,7 @@ sit-blocks: - ACACIA_STAIRS:0.7 - DARK_OAK_STAIRS:0.7 - RED_SANDSTONE_STAIRS:0.7 + - PURPUR_STAIRS:0.7 valid-signs: - SIGN - WALL_SIGN