Climbing should not bypass cramming gamerule

paper-server/patches/sources/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch

@@ -30,6 +30,15 @@
      public AbstractBoat(EntityType<? extends AbstractBoat> type, Level world, Supplier<Item> itemSupplier) {
          super(type, world);
          this.dropItem = itemSupplier;
+@@ -128,7 +144,7 @@
+     }
+ 
+     @Override
+-    public boolean isPushable() {
++    public boolean isCollidable(boolean ignoreClimbing) { // Paper - Climbing should not bypass cramming gamerule
+         return true;
+     }
+ 
 @@ -182,9 +198,29 @@
      public void push(Entity entity) {
          if (entity instanceof AbstractBoat) {

paper-server/patches/sources/net/minecraft/world/entity/vehicle/AbstractMinecart.java.patch

@@ -41,6 +41,15 @@
  
          if (t0 != null) {
              t0.setInitialPos(x, y, z);
+@@ -143,7 +161,7 @@
+     }
+ 
+     @Override
+-    public boolean isPushable() {
++    public boolean isCollidable(boolean ignoreClimbing) { // Paper - Climbing should not bypass cramming gamerule
+         return true;
+     }
+ 
 @@ -262,6 +280,14 @@
  
      @Override
@@ -112,15 +121,16 @@
                      double d0 = entity.getX() - this.getX();
                      double d1 = entity.getZ() - this.getZ();
                      double d2 = d0 * d0 + d1 * d1;
-@@ -645,4 +695,26 @@
+@@ -644,5 +694,27 @@
+ 
      public boolean isFurnace() {
          return false;
-     }
++    }
 +
 +    // CraftBukkit start - Methods for getting and setting flying and derailed velocity modifiers
 +    public Vector getFlyingVelocityMod() {
 +        return new Vector(this.flyingX, this.flyingY, this.flyingZ);
-+    }
+     }
 +
 +    public void setFlyingVelocityMod(Vector flying) {
 +        this.flyingX = flying.getX();