mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-02 21:22:05 -07:00
a24f9b204c
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
12 lines
756 B
Diff
12 lines
756 B
Diff
--- a/net/minecraft/server/commands/RideCommand.java
|
|
+++ b/net/minecraft/server/commands/RideCommand.java
|
|
@@ -60,7 +_,7 @@
|
|
Entity vehicle1 = target.getVehicle();
|
|
if (vehicle1 != null) {
|
|
throw ERROR_ALREADY_RIDING.create(target.getDisplayName(), vehicle1.getDisplayName());
|
|
- } else if (vehicle.getType() == EntityType.PLAYER) {
|
|
+ } else if (vehicle.getType() == EntityType.PLAYER && !io.papermc.paper.configuration.GlobalConfiguration.get().commands.rideCommandAllowPlayerAsVehicle) { // Paper - allow player as vehicle
|
|
throw ERROR_MOUNTING_PLAYER.create();
|
|
} else if (target.getSelfAndPassengers().anyMatch(entity -> entity == vehicle)) {
|
|
throw ERROR_MOUNTING_LOOP.create();
|