upstream #1

Closed
bridge wants to merge 65 commits from feat/upstream into 2.X
Showing only changes of commit 31518c2136 - Show all commits

View file

@ -195,7 +195,6 @@ public interface Npc extends PropertyHolder {
*/ */
void removePassenger(int entityId); void removePassenger(int entityId);
/** /**
* Gets the vehicle entity id of this npc * Gets the vehicle entity id of this npc
* @return The entity id of the vehicle * @return The entity id of the vehicle
@ -207,5 +206,4 @@ public interface Npc extends PropertyHolder {
* @param vehicleId The entity id of the vehicle * @param vehicleId The entity id of the vehicle
*/ */
void setVehicleId(Integer vehicleId); void setVehicleId(Integer vehicleId);
} }