Merge pull request #1 from TheLivan/master

Fix the strange code
stephengold · Apr 9, 2024 · fa22710 · fa22710
2 parents 8158d94 + 6f73547
commit fa22710
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/com/bulletphysics/collision/broadphase/HashedOverlappingPairCache.java b/src/com/bulletphysics/collision/broadphase/HashedOverlappingPairCache.java
@@ -230,7 +230,7 @@ public BroadphasePair findPair(BroadphaseProxy proxy0, BroadphaseProxy proxy1) {
 		if (proxy0.getUid() > proxy1.getUid()) {
 			BroadphaseProxy tmp = proxy0;
 			proxy0 = proxy1;
-			proxy1 = proxy0;
+			proxy1 = tmp;
 		}
 		int proxyId1 = proxy0.getUid();
 		int proxyId2 = proxy1.getUid();

diff --git a/src/com/bulletphysics/dynamics/constraintsolver/ConeTwistConstraint.java b/src/com/bulletphysics/dynamics/constraintsolver/ConeTwistConstraint.java
@@ -405,7 +405,7 @@ public boolean getSolveTwistLimit() {
 	}
 
 	public boolean getSolveSwingLimit() {
-		return solveTwistLimit;
+		return solveSwingLimit;
 	}
 
 	public float getTwistLimitSign() {

diff --git a/src/com/bulletphysics/linearmath/CProfileManager.java b/src/com/bulletphysics/linearmath/CProfileManager.java
@@ -33,6 +33,8 @@
 
 import com.bulletphysics.BulletStats;
 
+import java.util.Objects;
+
 /**
  * Manager for the profile system.
  * 
@@ -49,7 +51,7 @@ public class CProfileManager {
 	 * @param name must be {@link String#intern interned} String (not needed for String literals)
 	 */
 	public static void startProfile(String name) {
-		if (name != currentNode.getName()) {
+		if (!Objects.equals(name, currentNode.getName())) {
 			currentNode = currentNode.getSubNode(name);
 		}
 

diff --git a/src/com/bulletphysics/linearmath/CProfileNode.java b/src/com/bulletphysics/linearmath/CProfileNode.java
@@ -67,7 +67,7 @@ public CProfileNode getSubNode(String name) {
 		// Try to find this sub node
 		CProfileNode child = this.child;
 		while (child != null) {
-			if (child.name == name) {
+			if (child.name.equals(name)) {
 				return child;
 			}
 			child = child.sibling;