mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-01 05:01:37 +01:00
SPIGOT-7947: addPassenger doesn't work if the vehicle is a player
By: md_5 <git@md-5.net>
This commit is contained in:
parent
30af9c34dd
commit
0df40ed8d9
@ -620,6 +620,15 @@
|
|||||||
leashable.setLeashedTo(entityhuman, true);
|
leashable.setLeashedTo(entityhuman, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -2243,7 +2596,7 @@
|
||||||
|
return false;
|
||||||
|
} else if (!entity.couldAcceptPassenger()) {
|
||||||
|
return false;
|
||||||
|
- } else if (!this.level().isClientSide() && !entity.type.canSerialize()) {
|
||||||
|
+ } else if (!flag && !this.level().isClientSide() && !entity.type.canSerialize()) { // SPIGOT-7947: Allow force riding all entities
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
|
||||||
@@ -2255,6 +2608,27 @@
|
@@ -2255,6 +2608,27 @@
|
||||||
if (!flag && (!this.canRide(entity) || !entity.canAddPassenger(this))) {
|
if (!flag && (!this.canRide(entity) || !entity.canAddPassenger(this))) {
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user