Merge pull request #255 from fixrtm/NPE-in-EntityVehicleBase

remove printStackTrace from fixRiderPosOnDismount
fixrtm · Jul 10, 2021 · 80f4ef6 · 80f4ef6
2 parents c8b5454 + a767d14
commit 80f4ef6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/rtm-patches/jp/ngt/rtm/entity/vehicle/EntityVehicleBase.java.pm.patch b/src/main/rtm-patches/jp/ngt/rtm/entity/vehicle/EntityVehicleBase.java.pm.patch
@@ -1,11 +1,12 @@
 --- a/jp/ngt/rtm/entity/vehicle/EntityVehicleBase.java
 +++ b/jp/ngt/rtm/entity/vehicle/EntityVehicleBase.java
-@@ -269,12 +269,13 @@
+@@ -268,13 +268,13 @@
+
        try {
           ModelSetBase modelsetbase = (ModelSetBase)this.getResourceState().getResourceSet();
           axisalignedbb = modelsetbase.getCollisionObj().getSizeBox();
        } catch (NullPointerException nullpointerexception) {
-          nullpointerexception.printStackTrace();
+-         nullpointerexception.printStackTrace();
 -         axisalignedbb = new AxisAlignedBB(-1.5D, 0.0D, -2.0D, 1.5D, 3.0D, 2.0D);
        }
 +      if (axisalignedbb == null)
@@ -15,7 +16,7 @@
        vec3 = vec3.rotateAroundY(-this.rotationYaw);
        float f = NGTMath.wrapAngle(-passenger.rotationYaw - this.rotationYaw);
        double d0 = (double)f >= 0.0D ? axisalignedbb.maxX + 0.5D : axisalignedbb.minX - 0.5D;
-@@ -544,6 +545,18 @@
+@@ -544,6 +544,18 @@
     }
 
     public VehicleNGTO getNGTO() {