Skip to content

Commit 03436d8

Browse files
author
croxis
committed
Update to Spigot 1.13
Fixed NCPP support. I think
1 parent 2c8cd26 commit 03436d8

11 files changed

+61
-38
lines changed

‎build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ sourceCompatibility = '1.8'
1515
targetCompatibility = '1.8'
1616

1717
//dependencies versions
18-
ext.bukkitVersion = '1.12-R0.1-SNAPSHOT'
18+
ext.bukkitVersion = '1.13-pre7-R0.1-SNAPSHOT'
1919

2020
//dependencies declaration
2121
dependencies {
22-
compile group: 'fr.neatmonster', name: 'nocheatplus', version: '3.15.1-RC'
22+
compile group: 'fr.neatmonster', name: 'nocheatplus', version: '3.16.1-SNAPSHOT'
2323
compile group: 'org.spigotmc', name: 'spigot-api', version: bukkitVersion
2424

2525
compile 'org.spongepowered:spongeapi:7.0.0-SNAPSHOT'
@@ -48,6 +48,10 @@ repositories {
4848
maven {
4949
url "http://repo.md-5.net/content/repositories/releases/"
5050
}
51+
52+
maven {
53+
url "http://repo.md-5.net/content/repositories/snapshots/"
54+
}
5155

5256
maven {
5357
url "https://hub.spigotmc.org/nexus/content/groups/public/"

‎pom.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
2121

2222
<properties>
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24-
<bukkitVersion>1.12-R0.1-SNAPSHOT</bukkitVersion>
24+
<bukkitVersion>1.13-pre7-R0.1-SNAPSHOT</bukkitVersion>
2525
<spongeVersion>7.0.0-SNAPSHOT</spongeVersion>
2626
</properties>
2727

@@ -57,6 +57,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
5757
<id>spigot-repo</id>
5858
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
5959
</repository>
60+
<repository>
61+
<id>md_5-snapshots</id>
62+
<url>https://repo.md-5.net/content/repositories/snapshots/</url>
63+
</repository>
6064
<repository>
6165
<id>md5-repo</id>
6266
<url>http://repo.md-5.net/content/repositories/releases/</url>
@@ -175,7 +179,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
175179
<dependency>
176180
<groupId>fr.neatmonster</groupId>
177181
<artifactId>nocheatplus</artifactId>
178-
<version>3.15.1-RC</version>
182+
<version>3.16.0-RC</version>
179183
</dependency>
180184
<dependency>
181185
<groupId>org.spongepowered</groupId>

‎src/main/java/net/croxis/plugins/lift/BukkitConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* plugin file is part of Lift.
2+
* This file is part of Lift.
33
*
44
* Copyright (c) ${project.inceptionYear}-2013, croxis <https://github.com/croxis/>
55
*

‎src/main/java/net/croxis/plugins/lift/BukkitElevator.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ void quickEndLift() {
112112
Location destination = passenger.getLocation();
113113
destination.setY(destFloor.getY());
114114
passenger.teleport(destination);
115+
passenger.setFallDistance(0);
115116
}
116117
}
117118

@@ -121,6 +122,7 @@ boolean isInLift(Entity entity){
121122

122123
void removePassenger(Entity passenger){
123124
// NOt thread safe in an interation!
125+
passenger.setFallDistance(0);
124126
if (passengers.contains(passenger))
125127
passengers.remove(passenger);
126128
else if (holders.containsKey(passenger))

‎src/main/java/net/croxis/plugins/lift/BukkitElevatorManager.java‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,16 @@ public static BukkitElevator createLift(Block block, String cause){
104104
public static boolean isValidShaftBlock(Block checkBlock){
105105
return (BukkitConfig.floorMaterials.contains(checkBlock.getType())
106106
|| checkBlock.isEmpty()
107+
|| !checkBlock.getType().isSolid()
107108
|| checkBlock.getType() == Material.AIR
108109
|| checkBlock.getType() == Material.LADDER
109110
|| checkBlock.getType() == Material.SNOW
110-
|| checkBlock.getType() == Material.STATIONARY_WATER
111111
|| checkBlock.getType() == Material.STONE_BUTTON
112112
|| checkBlock.getType() == Material.TORCH
113113
|| checkBlock.getType() == Material.VINE
114114
|| checkBlock.getType() == Material.WALL_SIGN
115115
|| checkBlock.getType() == Material.WATER
116-
|| checkBlock.getType() == Material.WOOD_BUTTON
117-
|| checkBlock.getType() == Material.CARPET
118-
|| checkBlock.getType() == Material.RAILS
116+
|| checkBlock.getType() == Material.RAIL
119117
|| checkBlock.getType() == Material.DETECTOR_RAIL
120118
|| checkBlock.getType() == Material.ACTIVATOR_RAIL
121119
|| checkBlock.getType() == Material.POWERED_RAIL
@@ -138,6 +136,18 @@ public static void scanBaseBlocks(Block block, BukkitElevator bukkitElevator){
138136
if (block.getRelative(BlockFace.WEST, 1).getType() == bukkitElevator.baseBlockType)
139137
scanBaseBlocks(block.getRelative(BlockFace.WEST), bukkitElevator);
140138
}
139+
140+
public static boolean isButton(Block testBlock){
141+
if (testBlock.getType().toString().contains("BUTTON"))
142+
return true;
143+
return false;
144+
}
145+
146+
public static boolean isCarpet(Block testBlock){
147+
if (testBlock.getType().toString().contains("CARPET"))
148+
return true;
149+
return false;
150+
}
141151

142152
public static String constructFloors(BukkitElevator bukkitElevator){
143153
String message = "";
@@ -165,7 +175,7 @@ public static String constructFloors(BukkitElevator bukkitElevator){
165175
plugin.logDebug("Not valid shaft block" + x + " " + y1 + " " + z + " of type " + testBlock.getType().toString());
166176
break;
167177
}
168-
if (testBlock.getType() == Material.STONE_BUTTON || testBlock.getType() == Material.WOOD_BUTTON){
178+
if (isButton(testBlock)){
169179
if (BukkitConfig.checkFloor)
170180
if (!scanFloorAtY(currentWorld, testBlock.getY() - 2, bukkitElevator)){
171181
break;
@@ -224,6 +234,7 @@ public static void endLift(BukkitElevator bukkitElevator){
224234
Iterator<Entity> passengerIterator = bukkitElevator.getPassengers();
225235
while (passengerIterator.hasNext()){
226236
Entity e = passengerIterator.next();
237+
e.setFallDistance(0);
227238
fallers.remove(e);
228239
e.setVelocity(new Vector(0, 0, 0));
229240
if (e instanceof Player)
@@ -237,6 +248,7 @@ else if (e instanceof Minecart) {
237248
Iterator<Entity> holdersIterators = bukkitElevator.getHolders();
238249
while (holdersIterators.hasNext()){
239250
Entity passenger = holdersIterators.next();
251+
passenger.setFallDistance(0);
240252
if (passenger instanceof Player){
241253
removePlayer((Player) passenger, holdersIterators);
242254
} else if (passenger instanceof Minecart) {
@@ -259,32 +271,28 @@ else if (e instanceof Minecart) {
259271

260272
BlockFace directionFacing = sign.getFacing();
261273
if (directionFacing == BlockFace.NORTH){
262-
if (s.getRelative(BlockFace.SOUTH).getRelative(BlockFace.SOUTH).getType() == Material.STONE_BUTTON
263-
|| s.getRelative(BlockFace.SOUTH).getRelative(BlockFace.SOUTH).getType() == Material.WOOD_BUTTON){
274+
if (isButton(s.getRelative(BlockFace.SOUTH).getRelative(BlockFace.SOUTH))){
264275
BlockState state = s.getRelative(BlockFace.SOUTH).getRelative(BlockFace.SOUTH).getState();
265276
((org.bukkit.material.Button) state.getData()).setPowered(true);
266277
state.update();
267278
new BukkitCancelRedstoneTask(s.getRelative(BlockFace.SOUTH).getRelative(BlockFace.SOUTH)).runTaskLater(plugin, 10);
268279
}
269280
} else if (directionFacing == BlockFace.EAST){
270-
if (s.getRelative(BlockFace.WEST).getRelative(BlockFace.WEST).getType() == Material.STONE_BUTTON
271-
|| s.getRelative(BlockFace.WEST).getRelative(BlockFace.WEST).getType() == Material.WOOD_BUTTON){
281+
if (isButton(s.getRelative(BlockFace.WEST).getRelative(BlockFace.WEST))){
272282
BlockState state = s.getRelative(BlockFace.WEST).getRelative(BlockFace.WEST).getState();
273283
((org.bukkit.material.Button) state.getData()).setPowered(true);
274284
state.update();
275285
new BukkitCancelRedstoneTask(s.getRelative(BlockFace.WEST).getRelative(BlockFace.WEST)).runTaskLater(plugin, 10);
276286
}
277287
} else if (directionFacing == BlockFace.SOUTH){
278-
if (s.getRelative(BlockFace.NORTH).getRelative(BlockFace.NORTH).getType() == Material.STONE_BUTTON
279-
|| s.getRelative(BlockFace.NORTH).getRelative(BlockFace.NORTH).getType() == Material.WOOD_BUTTON){
288+
if (isButton(s.getRelative(BlockFace.NORTH).getRelative(BlockFace.NORTH))){
280289
BlockState state = s.getRelative(BlockFace.NORTH).getRelative(BlockFace.NORTH).getState();
281290
((org.bukkit.material.Button) state.getData()).setPowered(true);
282291
state.update();
283292
new BukkitCancelRedstoneTask(s.getRelative(BlockFace.NORTH).getRelative(BlockFace.NORTH)).runTaskLater(plugin, 10);
284293
}
285294
} else if (directionFacing == BlockFace.WEST){
286-
if (s.getRelative(BlockFace.EAST).getRelative(BlockFace.EAST).getType() == Material.STONE_BUTTON
287-
|| s.getRelative(BlockFace.EAST).getRelative(BlockFace.EAST).getType() == Material.WOOD_BUTTON){
295+
if (isButton(s.getRelative(BlockFace.EAST).getRelative(BlockFace.EAST))){
288296
BlockState state = s.getRelative(BlockFace.EAST).getRelative(BlockFace.EAST).getState();
289297
((org.bukkit.material.Button) state.getData()).setPowered(true);
290298
state.update();
@@ -301,6 +309,7 @@ public static void removePlayer(Player player, Iterator<Entity> passengers){
301309
plugin.logDebug("Scanning lift");
302310
if (bukkitElevator.isInLift(player)){
303311
plugin.logDebug("Removing player from lift");
312+
player.setFallDistance(0);
304313
restorePlayer(player);
305314
passengers.remove();
306315
}
@@ -314,6 +323,7 @@ public static void removePlayer(Player player){
314323
if (bukkitElevator.isInLift(player)){
315324
plugin.logDebug("Removing player from lift");
316325
player.setVelocity(new Vector(0, 0, 0));
326+
player.setFallDistance(0);
317327
restorePlayer(player);
318328
bukkitElevator.removePassenger(player);
319329
}
@@ -324,6 +334,7 @@ public static void removePassenger(Entity passenger){
324334
if (isPassenger(passenger)){
325335
plugin.logDebug("Removing entity " + passenger.toString() + " from El: " + bukkitElevators.toString());
326336
passenger.setVelocity(new Vector(0, 0, 0));
337+
passenger.setFallDistance(0);
327338
if (passenger instanceof Player)
328339
removePlayer((Player) passenger);
329340
else
@@ -361,7 +372,7 @@ public static void setupPlayer(Player player){
361372
player.setAllowFlight(true);
362373

363374
if (BukkitConfig.useNoCheatPlus)
364-
NCPExemptionManager.isExempted(player, fr.neatmonster.nocheatplus.checks.CheckType.FIGHT);
375+
NCPExemptionManager.exemptPermanently(player, fr.neatmonster.nocheatplus.checks.CheckType.FIGHT);
365376
}
366377

367378
static void restorePlayer(Player player){

‎src/main/java/net/croxis/plugins/lift/BukkitLift.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,26 @@
1818
*/
1919
package net.croxis.plugins.lift;
2020

21-
import java.util.List;
22-
import java.util.Set;
2321
import java.util.logging.Level;
2422

25-
import org.bukkit.Bukkit;
23+
import fr.neatmonster.nocheatplus.NCPAPIProvider;
24+
import fr.neatmonster.nocheatplus.components.NoCheatPlusAPI;
25+
import fr.neatmonster.nocheatplus.hooks.NCPExemptionManager;
2626
import org.bukkit.Material;
2727
import org.bukkit.block.BlockFace;
2828
import org.bukkit.entity.Player;
2929
import org.bukkit.event.EventHandler;
3030
import org.bukkit.event.EventPriority;
3131
import org.bukkit.event.Listener;
3232
import org.bukkit.event.player.PlayerMoveEvent;
33+
import org.bukkit.plugin.Plugin;
3334
import org.bukkit.plugin.java.JavaPlugin;
3435
import org.bukkit.command.*;
3536

3637
public class BukkitLift extends JavaPlugin implements Listener {
3738
public static BukkitElevatorManager manager;
3839
static BukkitConfig config = new BukkitConfig();
40+
NoCheatPlusAPI ncp = null;
3941

4042
public Double getBlockSpeed(Material material) {
4143
try {

‎src/main/java/net/croxis/plugins/lift/BukkitLiftPlayerListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void onPlayerInteract(PlayerInteractEvent event){
5454

5555
if (event.getClickedBlock().getType() == Material.WALL_SIGN
5656
&& buttonBlock != null
57-
&& (buttonBlock.getType() == Material.STONE_BUTTON || buttonBlock.getType() == Material.WOOD_BUTTON)) {
57+
&& BukkitElevatorManager.isButton(buttonBlock)) {
5858

5959
Sign sign = (Sign) event.getClickedBlock().getState();
6060
BukkitElevator bukkitElevator = BukkitElevatorManager.createLift(buttonBlock, event.getPlayer().getName());

‎src/main/java/net/croxis/plugins/lift/BukkitLiftRedstoneListener.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public BukkitLiftRedstoneListener(BukkitLift plugin){
5353
public void onBlockRedstoneChange(BlockRedstoneEvent event){
5454
block = event.getBlock();
5555
canDo = false;
56-
canDo = (event.getBlock().getType() == Material.STONE_BUTTON || event.getBlock().getType() == Material.WOOD_BUTTON)
56+
canDo = BukkitElevatorManager.isButton(event.getBlock())
5757
&& (!event.getBlock().isBlockIndirectlyPowered())
5858
&& event.getBlock().getRelative(BlockFace.UP).getType() == Material.WALL_SIGN;
5959
String reason = "Button press";
@@ -75,7 +75,7 @@ public void onBlockRedstoneChange(BlockRedstoneEvent event){
7575
blocks2[3] = b.getRelative(BlockFace.SOUTH);
7676
for (Block b2 : blocks2){
7777
//plugin.logDebug("Block Type " + b.toString());
78-
if ((b2.getType() == Material.STONE_BUTTON || b2.getType() == Material.WOOD_BUTTON)
78+
if (BukkitElevatorManager.isButton(b2)
7979
&& b2.getRelative(BlockFace.UP).getType() == Material.WALL_SIGN){
8080
canDo = true;
8181
block = b2;
@@ -156,7 +156,7 @@ public void onBlockRedstoneChange(BlockRedstoneEvent event){
156156
bukkitElevator.addMinecartSpeed((Minecart) entity);
157157
//A minecart wont go up if attached to a rail, so we temp remove the rail.
158158
if (bukkitElevator.goingUp
159-
&& (entity.getLocation().getBlock().getType() == Material.RAILS
159+
&& (entity.getLocation().getBlock().getType() == Material.RAIL
160160
|| entity.getLocation().getBlock().getType() == Material.DETECTOR_RAIL
161161
|| entity.getLocation().getBlock().getType() == Material.ACTIVATOR_RAIL
162162
|| entity.getLocation().getBlock().getType() == Material.POWERED_RAIL)){
@@ -204,10 +204,10 @@ public void onBlockRedstoneChange(BlockRedstoneEvent event){
204204
Block gb = event.getBlock().getWorld().getBlockAt(b.getX(), f.getY()-2, b.getZ());
205205
bukkitElevator.addFloorBlock(gb);
206206

207-
if (gb.getRelative(BlockFace.UP).getType() == Material.CARPET){
207+
if (gb.getRelative(BlockFace.UP).getType().toString().contains("CARPET")){
208208
bukkitElevator.addCarpetBlock(gb.getRelative(BlockFace.UP));
209209
gb.getRelative(BlockFace.UP).setType(Material.AIR);
210-
} else if (gb.getRelative(BlockFace.UP).getType() == Material.RAILS
210+
} else if (gb.getRelative(BlockFace.UP).getType() == Material.RAIL
211211
|| gb.getRelative(BlockFace.UP).getType() == Material.DETECTOR_RAIL
212212
|| gb.getRelative(BlockFace.UP).getType() == Material.POWERED_RAIL
213213
|| gb.getRelative(BlockFace.UP).getType() == Material.ACTIVATOR_RAIL){

‎src/main/java/net/croxis/plugins/lift/SpongeElevator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,12 @@ boolean scanFloorAtY(int y){
265265
void endLift(){
266266
plugin.debug("Halting lift: " + this.toString());
267267
for (Location location : floorBlocks.keySet()){
268-
location.restoreSnapshot(floorBlocks.get(location), true, BlockChangeFlag.ALL, Cause.source(this).build());
269-
if (location.getBlockType() == BlockTypes.AIR && !Config.checkFloor)
270-
location.setBlockType(SpongeConfig.floorMaterials.iterator().next(), Cause.source(plugin.container).build());
268+
//location.restoreSnapshot(floorBlocks.get(location), true, BlockChangeFlag.ALL, Cause.source(this).build());
269+
//if (location.getBlockType() == BlockTypes.AIR && !Config.checkFloor)
270+
// location.setBlockType(SpongeConfig.floorMaterials.iterator().next(), Cause.source(plugin.container).build());
271271
}
272272
for (Location location : aboveFloorBlocks.keySet()){
273-
location.restoreSnapshot(aboveFloorBlocks.get(location), true, BlockChangeFlag.ALL, Cause.source(plugin.container).build());
273+
//location.restoreSnapshot(aboveFloorBlocks.get(location), true, BlockChangeFlag.ALL, Cause.source(plugin.container).build());
274274
}
275275

276276
for (Iterator<Entity> iter = passengers.iterator(); iter.hasNext(); ){
@@ -309,7 +309,7 @@ else if (direction.equals(Direction.WEST))
309309

310310
Location<World> testBlock = signLocation.getRelative(behindBlock).getRelative(behindBlock);
311311
if (testBlock.getBlockType().equals(BlockTypes.STONE_BUTTON) || testBlock.getBlockType().equals(BlockTypes.WOODEN_BUTTON)){
312-
testBlock.offer(Keys.POWERED, true, Cause.source(plugin.container).build());
312+
//testBlock.offer(Keys.POWERED, true, Cause.source(plugin.container).build());
313313
}
314314

315315
clear();

‎src/main/java/net/croxis/plugins/lift/SpongeLiftPlayerListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ else if (elevator.getTotalFloors() == 1) {
136136

137137
@Listener
138138
public void onPlayerItemPickup(ChangeInventoryEvent.Pickup event){
139-
if (SpongeElevatorManager.isPassenger(event.getTargetEntity()))
140-
SpongeElevatorManager.removePassenger(event.getTargetEntity());
139+
//if (SpongeElevatorManager.isPassenger(event.getTargetEntity()))
140+
// SpongeElevatorManager.removePassenger(event.getTargetEntity());
141141
}
142142

143143
@Listener

0 commit comments

Comments
 (0)