Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-26 06:24:54 +02:00
Code Issues Projects Releases Wiki Activity

Catch Throwable instead of Exception

Browse Source
This commit is contained in:
TheMode 2021-08-23 03:46:10 +02:00
parent f1c9268897
commit 2450e741e6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -877,13 +877,15 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler
* *
* @param entity the new passenger * @param entity the new passenger
* @throws NullPointerException if {@code entity} is null * @throws NullPointerException if {@code entity} is null
* @throws IllegalStateException if {@link #getInstance()} returns null * @throws IllegalStateException if {@link #getInstance()} returns null or the passenger cannot be added
*/ */
public void addPassenger(@NotNull Entity entity) { public void addPassenger(@NotNull Entity entity) {
Check.stateCondition(instance == null, "You need to set an instance using Entity#setInstance"); Check.stateCondition(instance == null, "You need to set an instance using Entity#setInstance");
Check.stateCondition(entity == getVehicle(), "Cannot add the entity vehicle as a passenger");
if (entity.getVehicle() != null) { final Entity vehicle = entity.getVehicle();
entity.getVehicle().removePassenger(entity); if (vehicle != null) {
vehicle.removePassenger(entity);
} }
this.passengers.add(entity); this.passengers.add(entity);
@ -1456,7 +1458,6 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler
} }
/** /**
* Gets the line of sight of the entity. * Gets the line of sight of the entity.
* *
@ -1510,7 +1511,7 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler
/** /**
* Gets first entity on the line of sight of the current one that matches the given predicate. * Gets first entity on the line of sight of the current one that matches the given predicate.
* *
* @param range max length of the line of sight of the current entity to be checked. * @param range max length of the line of sight of the current entity to be checked.
* @param predicate optional predicate * @param predicate optional predicate
* @return resulting entity whether there're any, null otherwise. * @return resulting entity whether there're any, null otherwise.
*/ */