Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-17 17:31:06 +02:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3283: Don't allow plugin induced infinite velocity / position

Browse Source
This commit is contained in:
md_5 2017-06-02 18:44:37 +10:00
parent 9496c2dad1
commit 921ba53556
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@ -236,10 +236,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return new Vector(entity.motX, entity.motY, entity.motZ); return new Vector(entity.motX, entity.motY, entity.motZ);
} }
public void setVelocity(Vector vel) { public void setVelocity(Vector velocity) {
entity.motX = vel.getX(); Preconditions.checkArgument(velocity != null, "velocity");
entity.motY = vel.getY(); velocity.checkFinite();
entity.motZ = vel.getZ(); entity.motX = velocity.getX();
entity.motY = velocity.getY();
entity.motZ = velocity.getZ();
entity.velocityChanged = true; entity.velocityChanged = true;
} }
@ -269,6 +271,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
} }
public boolean teleport(Location location, TeleportCause cause) { public boolean teleport(Location location, TeleportCause cause) {
Preconditions.checkArgument(location != null, "location");
location.checkFinite();
if (entity.isVehicle() || entity.dead) { if (entity.isVehicle() || entity.dead) {
return false; return false;
} }