mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-07 15:42:19 -07:00
b745ab65e6
Initial move of patches to rejected and non rejected source patches to publish to patch-roulette.
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();
|