PandacubeFr/ChairsReloaded
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to spigot 1.9. Remove 1.6.4-1.7.10 compat.

Browse Source
This commit is contained in:
Shevchik
2016-03-02 21:07:11 +03:00
parent 8abf45df3d
commit b25975aaea
37 changed files with 70 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/cnaude/chairs/core/Chairs.java
View File

@@ -7,6 +7,7 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.configuration.file.FileConfiguration;
@@ -85,7 +86,7 @@ public class Chairs extends JavaPlugin {
@Override
public void onDisable() {
if (psitdata != null) {
for (Player player : Utils.getOnlinePlayers()) {
for (Player player : Bukkit.getOnlinePlayers()) {
if (psitdata.isSitting(player)) {
psitdata.unsitPlayerForce(player);
}

12
src/com/cnaude/chairs/core/Utils.java
View File

@@ -1,12 +0,0 @@
package com.cnaude.chairs.core;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
public class Utils {
public static Player[] getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
}

2
src/com/cnaude/chairs/listeners/TrySitEventListener.java
View File

@@ -59,7 +59,7 @@ public class TrySitEventListener implements Listener {
}
// Check for item in hand
if (plugin.ignoreIfBlockInHand && player.getItemInHand().getType() != Material.AIR) {
if (plugin.ignoreIfBlockInHand && player.getInventory().getItemInMainHand().getType() != Material.AIR) {
return false;
}

5
src/com/cnaude/chairs/sitaddons/ChairEffects.java
View File

@@ -11,7 +11,6 @@ import org.bukkit.event.player.PlayerLevelChangeEvent;
import org.bukkit.event.player.PlayerPickupItemEvent;
import com.cnaude.chairs.core.Chairs;
import com.cnaude.chairs.core.Utils;
public class ChairEffects {
@@ -44,7 +43,7 @@ public class ChairEffects {
healTaskID = plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override
public void run() {
for (Player p : Utils.getOnlinePlayers()) {
for (Player p : Bukkit.getOnlinePlayers()) {
if (plugin.getPlayerSitData().isSitting(p)) {
if (p.hasPermission("chairs.sit.health")) {
double pHealthPcnt = (getPlayerHealth(p)) / getMaxPlayerHealth(p) * 100d;
@@ -90,7 +89,7 @@ public class ChairEffects {
pickupTaskID = plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override
public void run() {
for (Player p : Utils.getOnlinePlayers()) {
for (Player p : Bukkit.getOnlinePlayers()) {
if (plugin.getPlayerSitData().isSitting(p)) {
for (Entity entity : p.getNearbyEntities(1, 2, 1)) {
if (entity instanceof Item) {

30
src/com/cnaude/chairs/vehiclearrow/v1_6_R3/CraftChairsArrow.java
View File

@@ -1,30 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_6_R3;
import net.minecraft.server.v1_6_R3.EntityArrow;
import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
import org.bukkit.craftbukkit.v1_6_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();
}
}

20
src/com/cnaude/chairs/vehiclearrow/v1_6_R3/NMSArrowFactory.java
View File

@@ -1,20 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_6_R3;
import net.minecraft.server.v1_6_R3.EntityArrow;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
import org.bukkit.entity.Arrow;
import com.cnaude.chairs.vehiclearrow.NMSArrowFactoryInterface;
public class NMSArrowFactory implements NMSArrowFactoryInterface {
@Override
public Arrow spawnArrow(Location location) {
CraftWorld world = (CraftWorld) location.getWorld();
EntityArrow arrow = new NMSChairsArrow(world, location);
return (Arrow) arrow.getBukkitEntity();
}
}

23
src/com/cnaude/chairs/vehiclearrow/v1_6_R3/NMSChairsArrow.java
View File

@@ -1,23 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_6_R3;
import net.minecraft.server.v1_6_R3.EntityArrow;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
import org.bukkit.craftbukkit.v1_6_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 l_() {
}
}

23
src/com/cnaude/chairs/vehiclearrow/v1_7_R1/NMSChairsArrow.java
View File

@@ -1,23 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R1;
import net.minecraft.server.v1_7_R1.EntityArrow;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
import org.bukkit.craftbukkit.v1_7_R1.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 h() {
}
}

30
src/com/cnaude/chairs/vehiclearrow/v1_7_R2/CraftChairsArrow.java
View File

@@ -1,30 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R2;
import net.minecraft.server.v1_7_R2.EntityArrow;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.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();
}
}

20
src/com/cnaude/chairs/vehiclearrow/v1_7_R2/NMSArrowFactory.java
View File

@@ -1,20 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R2;
import net.minecraft.server.v1_7_R2.EntityArrow;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R2.CraftWorld;
import org.bukkit.entity.Arrow;
import com.cnaude.chairs.vehiclearrow.NMSArrowFactoryInterface;
public class NMSArrowFactory implements NMSArrowFactoryInterface {
@Override
public Arrow spawnArrow(Location location) {
CraftWorld world = (CraftWorld) location.getWorld();
EntityArrow arrow = new NMSChairsArrow(world, location);
return (Arrow) arrow.getBukkitEntity();
}
}

30
src/com/cnaude/chairs/vehiclearrow/v1_7_R3/CraftChairsArrow.java
View File

@@ -1,30 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R3;
import net.minecraft.server.v1_7_R3.EntityArrow;
import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
import org.bukkit.craftbukkit.v1_7_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();
}
}

20
src/com/cnaude/chairs/vehiclearrow/v1_7_R3/NMSArrowFactory.java
View File

@@ -1,20 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R3;
import net.minecraft.server.v1_7_R3.EntityArrow;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R3.CraftWorld;
import org.bukkit.entity.Arrow;
import com.cnaude.chairs.vehiclearrow.NMSArrowFactoryInterface;
public class NMSArrowFactory implements NMSArrowFactoryInterface {
@Override
public Arrow spawnArrow(Location location) {
CraftWorld world = (CraftWorld) location.getWorld();
EntityArrow arrow = new NMSChairsArrow(world, location);
return (Arrow) arrow.getBukkitEntity();
}
}

23
src/com/cnaude/chairs/vehiclearrow/v1_7_R3/NMSChairsArrow.java
View File

@@ -1,23 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R3;
import net.minecraft.server.v1_7_R3.EntityArrow;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
import org.bukkit.craftbukkit.v1_7_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 h() {
}
}

30
src/com/cnaude/chairs/vehiclearrow/v1_7_R4/CraftChairsArrow.java
View File

@@ -1,30 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R4;
import net.minecraft.server.v1_7_R4.EntityArrow;
import org.bukkit.craftbukkit.v1_7_R4.CraftServer;
import org.bukkit.craftbukkit.v1_7_R4.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();
}
}

20
src/com/cnaude/chairs/vehiclearrow/v1_7_R4/NMSArrowFactory.java
View File

@@ -1,20 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R4;
import net.minecraft.server.v1_7_R4.EntityArrow;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
import org.bukkit.entity.Arrow;
import com.cnaude.chairs.vehiclearrow.NMSArrowFactoryInterface;
public class NMSArrowFactory implements NMSArrowFactoryInterface {
@Override
public Arrow spawnArrow(Location location) {
CraftWorld world = (CraftWorld) location.getWorld();
EntityArrow arrow = new NMSChairsArrow(world, location);
return (Arrow) arrow.getBukkitEntity();
}
}

23
src/com/cnaude/chairs/vehiclearrow/v1_7_R4/NMSChairsArrow.java
View File

@@ -1,23 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R4;
import net.minecraft.server.v1_7_R4.EntityArrow;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R4.CraftServer;
import org.bukkit.craftbukkit.v1_7_R4.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 h() {
}
}

30
src/com/cnaude/chairs/vehiclearrow/v1_8_R1/CraftChairsArrow.java
View File

@@ -1,30 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_8_R1;
import net.minecraft.server.v1_8_R1.EntityArrow;
import org.bukkit.craftbukkit.v1_8_R1.CraftServer;
import org.bukkit.craftbukkit.v1_8_R1.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();
}
}

20
src/com/cnaude/chairs/vehiclearrow/v1_8_R1/NMSArrowFactory.java
View File

@@ -1,20 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_8_R1;
import net.minecraft.server.v1_8_R1.EntityArrow;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
import org.bukkit.entity.Arrow;
import com.cnaude.chairs.vehiclearrow.NMSArrowFactoryInterface;
public class NMSArrowFactory implements NMSArrowFactoryInterface {
@Override
public Arrow spawnArrow(Location location) {
CraftWorld world = (CraftWorld) location.getWorld();
EntityArrow arrow = new NMSChairsArrow(world, location);
return (Arrow) arrow.getBukkitEntity();
}
}

23
src/com/cnaude/chairs/vehiclearrow/v1_8_R1/NMSChairsArrow.java
View File

@@ -1,23 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_8_R1;
import net.minecraft.server.v1_8_R1.EntityArrow;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R1.CraftServer;
import org.bukkit.craftbukkit.v1_8_R1.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 s_() {
}
}

30
src/com/cnaude/chairs/vehiclearrow/v1_8_R2/CraftChairsArrow.java
View File

@@ -1,30 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_8_R2;
import net.minecraft.server.v1_8_R2.EntityArrow;
import org.bukkit.craftbukkit.v1_8_R2.CraftServer;
import org.bukkit.craftbukkit.v1_8_R2.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();
}
}

20
src/com/cnaude/chairs/vehiclearrow/v1_8_R2/NMSArrowFactory.java
View File

@@ -1,20 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_8_R2;
import net.minecraft.server.v1_8_R2.EntityArrow;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R2.CraftWorld;
import org.bukkit.entity.Arrow;
import com.cnaude.chairs.vehiclearrow.NMSArrowFactoryInterface;
public class NMSArrowFactory implements NMSArrowFactoryInterface {
@Override
public Arrow spawnArrow(Location location) {
CraftWorld world = (CraftWorld) location.getWorld();
EntityArrow arrow = new NMSChairsArrow(world, location);
return (Arrow) arrow.getBukkitEntity();
}
}

23
src/com/cnaude/chairs/vehiclearrow/v1_8_R2/NMSChairsArrow.java
View File

@@ -1,23 +0,0 @@
package com.cnaude.chairs.vehiclearrow.v1_8_R2;
import net.minecraft.server.v1_8_R2.EntityArrow;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R2.CraftServer;
import org.bukkit.craftbukkit.v1_8_R2.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_() {
}
}

9
src/com/cnaude/chairs/vehiclearrow/v1_8_R3/CraftChairsArrow.java
View File

@@ -27,4 +27,13 @@ public class CraftChairsArrow extends CraftArrow implements Vehicle {
super.remove();
}
@Override
public boolean isGlowing() {
return false;
}
@Override
public void setGlowing(boolean glowing) {
}
}

60
src/com/cnaude/chairs/vehiclearrow/v1_7_R1/CraftChairsArrow.java → src/com/cnaude/chairs/vehiclearrow/v_1_9_R1/CraftChairsArrow.java
View File

@@ -1,30 +1,30 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R1;
import net.minecraft.server.v1_7_R1.EntityArrow;
import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
import org.bukkit.craftbukkit.v1_7_R1.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();
}
}
package com.cnaude.chairs.vehiclearrow.v_1_9_R1;
import net.minecraft.server.v1_9_R1.EntityArrow;
import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
import org.bukkit.craftbukkit.v1_9_R1.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();
}
}

6
src/com/cnaude/chairs/vehiclearrow/v1_7_R1/NMSArrowFactory.java → src/com/cnaude/chairs/vehiclearrow/v_1_9_R1/NMSArrowFactory.java
View File

@@ -1,9 +1,9 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R1;
package com.cnaude.chairs.vehiclearrow.v_1_9_R1;
import net.minecraft.server.v1_7_R1.EntityArrow;
import net.minecraft.server.v1_9_R1.EntityArrow;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
import org.bukkit.entity.Arrow;
import com.cnaude.chairs.vehiclearrow.NMSArrowFactoryInterface;

46
src/com/cnaude/chairs/vehiclearrow/v1_7_R2/NMSChairsArrow.java → src/com/cnaude/chairs/vehiclearrow/v_1_9_R1/NMSChairsArrow.java
View File

@@ -1,23 +1,23 @@
package com.cnaude.chairs.vehiclearrow.v1_7_R2;
import net.minecraft.server.v1_7_R2.EntityArrow;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.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 h() {
}
}
package com.cnaude.chairs.vehiclearrow.v_1_9_R1;
import net.minecraft.server.v1_9_R1.EntityTippedArrow;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
import org.bukkit.craftbukkit.v1_9_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 m() {
}
}