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

Merge pull request #5 from Gamealition/1.11

Browse Source 
Update to 1.11
This commit is contained in:
Shevchik 2016-11-18 13:31:27 +03:00 committed by GitHub
commit 3f0fa8d8d0
6 changed files with 55 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libs/craftbukkit111.jar Normal file
View File

Binary file not shown.

BIN
libs/craftbukkit188.jar
View File

Binary file not shown.

67
src/com/cnaude/chairs/vehiclearrow/v1_8_R3/CraftChairsArrow.java → src/com/cnaude/chairs/vehiclearrow/v1_11_R1/CraftChairsArrow.java
View File

@ -1,39 +1,28 @@
package com.cnaude.chairs.vehiclearrow.v1_8_R3; package com.cnaude.chairs.vehiclearrow.v1_11_R1;
import net.minecraft.server.v1_8_R3.EntityArrow; import com.cnaude.chairs.api.ChairsAPI;
import net.minecraft.server.v1_11_R1.EntityArrow;
import org.bukkit.craftbukkit.v1_8_R3.CraftServer; import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftArrow; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftArrow;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Vehicle; import org.bukkit.entity.Vehicle;
import com.cnaude.chairs.api.ChairsAPI; public class CraftChairsArrow extends CraftArrow implements Vehicle {
public class CraftChairsArrow extends CraftArrow implements Vehicle { public CraftChairsArrow(CraftServer server, EntityArrow entity) {
super(server, entity);
public CraftChairsArrow(CraftServer server, EntityArrow entity) { }
super(server, entity);
} @Override
public void remove() {
@Override Entity passenger = getPassenger();
public void remove() { if (passenger != null && passenger instanceof Player) {
Entity passenger = getPassenger(); if (ChairsAPI.isSitting((Player) passenger)) {
if (passenger != null && passenger instanceof Player) { return;
if (ChairsAPI.isSitting((Player) passenger)) { }
return; }
} super.remove();
} }
super.remove();
} }
@Override
public boolean isGlowing() {
return false;
}
@Override
public void setGlowing(boolean glowing) {
}
}

12
src/com/cnaude/chairs/vehiclearrow/v1_8_R3/NMSArrowFactory.java → src/com/cnaude/chairs/vehiclearrow/v1_11_R1/NMSArrowFactory.java
View File

@ -1,12 +1,10 @@
package com.cnaude.chairs.vehiclearrow.v1_8_R3; package com.cnaude.chairs.vehiclearrow.v1_11_R1;
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;
import com.cnaude.chairs.vehiclearrow.NMSArrowFactoryInterface; 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 { public class NMSArrowFactory implements NMSArrowFactoryInterface {

44
src/com/cnaude/chairs/vehiclearrow/v1_8_R3/NMSChairsArrow.java → src/com/cnaude/chairs/vehiclearrow/v1_11_R1/NMSChairsArrow.java
View File

@ -1,23 +1,21 @@
package com.cnaude.chairs.vehiclearrow.v1_8_R3; package com.cnaude.chairs.vehiclearrow.v1_11_R1;
import net.minecraft.server.v1_8_R3.EntityArrow; import net.minecraft.server.v1_11_R1.EntityTippedArrow;
import org.bukkit.Bukkit;
import org.bukkit.Bukkit; import org.bukkit.Location;
import org.bukkit.Location; import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_8_R3.CraftServer; import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
public class NMSChairsArrow extends EntityTippedArrow {
public class NMSChairsArrow extends EntityArrow {
public NMSChairsArrow(CraftWorld cworld, Location location) {
public NMSChairsArrow(CraftWorld cworld, Location location) { super(cworld.getHandle());
super(cworld.getHandle()); setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
setPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); world.addEntity(this);
world.addEntity(this); bukkitEntity = new CraftChairsArrow((CraftServer) Bukkit.getServer(), this);
bukkitEntity = new CraftChairsArrow((CraftServer) Bukkit.getServer(), this); }
}
@Override
@Override public void A_() {
public void t_() { }
} }
}

1
src/config.yml
View File

@ -26,6 +26,7 @@ sit-blocks:
- ACACIA_STAIRS:0.7 - ACACIA_STAIRS:0.7
- DARK_OAK_STAIRS:0.7 - DARK_OAK_STAIRS:0.7
- RED_SANDSTONE_STAIRS:0.7 - RED_SANDSTONE_STAIRS:0.7
- PURPUR_STAIRS:0.7
valid-signs: valid-signs:
- SIGN - SIGN
- WALL_SIGN - WALL_SIGN