Merge branch 'develop'

sgift · Jul 20, 2024 · ff14d94 · ff14d94
2 parents 5830d69 + 4c91112
commit ff14d94
Showing 1 changed file with 76 additions and 68 deletions.
diff --git a/game/src/main/java/net/driftingsouls/ds2/server/ships/Ship.java b/game/src/main/java/net/driftingsouls/ds2/server/ships/Ship.java
@@ -2133,90 +2133,98 @@ public boolean dock(DockMode mode, Ship ... dockships)
 	 */
 	public void destroy() {
 		var db = ContextMap.getContext().getEM();
+		var transaction = db.getTransaction();
+		var wasActive = transaction.isActive();
+		if(!wasActive) {
+			transaction.begin();
+		}
+
+		try {
+			// Checken wir mal, ob die Flotte danach noch bestehen darf....
+			if (this.fleet != null) {
+				long fleetcount = db.createQuery("select count(*) from Ship where fleet=:fleet")
+						.setParameter("fleet", fleet)
+						.getFirstResult();
+				if (fleetcount <= 2) {
+					final ShipFleet currentFleet = this.fleet;
+
+					var shipList = db.createQuery("from Ship where fleet=:fleet", Ship.class)
+							.setParameter("fleet", this.fleet)
+							.getResultList();
+					shipList.forEach(ship -> ship.setFleet(null));
+
+					db.remove(currentFleet);
+				}
+			}
 
-		// Checken wir mal, ob die Flotte danach noch bestehen darf....
-		if( this.fleet != null ) {
-			long fleetcount = db.createQuery("select count(*) from Ship where fleet=:fleet")
-			.setParameter("fleet", fleet)
-			.getFirstResult();
-			if( fleetcount <= 2 ) {
-				final ShipFleet currentFleet = this.fleet;
-
-				var shipList = db.createQuery("from Ship where fleet=:fleet", Ship.class)
-					.setParameter("fleet", this.fleet)
-						.getResultList();
-				shipList.forEach(ship -> ship.setFleet(null));
-
-				db.remove(currentFleet);
+			// Ist das Schiff selbst gedockt? → Abdocken
+			if (this.docked != null && !this.docked.isEmpty() && (this.docked.charAt(0) != 'l')) {
+				Ship docked = db.find(Ship.class, Integer.parseInt(this.docked));
+				if (docked != null) {
+					docked.undock(this);
+				} else {
+					log.debug("Docked entry of ship was illegal: " + this.docked);
+				}
 			}
-		}
 
-		// Ist das Schiff selbst gedockt? → Abdocken
-		if(this.docked != null && !this.docked.isEmpty() && (this.docked.charAt(0) != 'l') ) {
-			Ship docked = db.find(Ship.class, Integer.parseInt(this.docked));
-			if(docked != null)
-			{
-				docked.undock(this);
+			// Evt. gedockte Schiffe abdocken
+			ShipTypeData type = this.getTypeData();
+			if (type.getADocks() != 0) {
+				undock();
 			}
-			else
-			{
-				log.debug("Docked entry of ship was illegal: " + this.docked);
+			if (type.getJDocks() != 0) {
+				start();
 			}
-		}
 
-		// Evt. gedockte Schiffe abdocken
-		ShipTypeData type = this.getTypeData();
-		if( type.getADocks() != 0 ) {
-			undock();
-		}
-		if( type.getJDocks() != 0 ) {
-			start();
-		}
+			// Gibts bereits einen Loesch-Task? Wenn ja, dann diesen entfernen
+			Taskmanager taskmanager = Taskmanager.getInstance();
+			Task[] tasks = taskmanager.getTasksByData(Taskmanager.Types.SHIP_DESTROY_COUNTDOWN, Integer.toString(this.id), "*", "*");
+			for (Task task : tasks) {
+				taskmanager.removeTask(task.getTaskID());
+			}
 
-		// Gibts bereits einen Loesch-Task? Wenn ja, dann diesen entfernen
-		Taskmanager taskmanager = Taskmanager.getInstance();
-		Task[] tasks = taskmanager.getTasksByData( Taskmanager.Types.SHIP_DESTROY_COUNTDOWN, Integer.toString(this.id), "*", "*");
-		for (Task task : tasks)
-		{
-			taskmanager.removeTask(task.getTaskID());
-		}
+			// Und nun loeschen wir es...
+			this.flags.clear();
 
-		// Und nun loeschen wir es...
-		this.flags.clear();
+			db.createQuery("delete from Offizier where stationiertAufSchiff=:dest")
+					.setParameter("dest", this)
+					.executeUpdate();
 
-		db.createQuery("delete from Offizier where stationiertAufSchiff=:dest")
-			.setParameter("dest", this)
-			.executeUpdate();
+			db.createQuery("delete from Jump where ship=:id")
+					.setParameter("id", this)
+					.executeUpdate();
 
-		db.createQuery("delete from Jump where ship=:id")
-			.setParameter("id", this)
-			.executeUpdate();
+			db.createQuery("from ShipWerft where ship=:ship", ShipWerft.class)
+					.setParameter("ship", this)
+					.getResultList().stream().findFirst().ifPresent(WerftObject::destroy);
 
-        db.createQuery("from ShipWerft where ship=:ship", ShipWerft.class)
-                .setParameter("ship", this)
-                .getResultList().stream().findFirst().ifPresent(WerftObject::destroy);
+			// Delete Trade Limits if necessary
+			if (this.isTradepost()) {
+				db.createQuery("delete from ResourceLimit where ship=:ship").setParameter("ship", this).executeUpdate();
+				db.createQuery("delete from SellLimit where ship=:ship").setParameter("ship", this).executeUpdate();
+			}
 
-        // Delete Trade Limits if necessary
-		if (this.isTradepost())
-		{
-			db.createQuery("delete from ResourceLimit where ship=:ship").setParameter("ship", this).executeUpdate();
-			db.createQuery("delete from SellLimit where ship=:ship").setParameter("ship", this).executeUpdate();
-		}
+			if (units != null) {
+				units.forEach(db::remove);
+			}
 
-		if(units != null)
-		{
-			units.forEach(db::remove);
-		}
+			if (this.einstellungen != null) {
+				db.remove(this.einstellungen);
+				this.einstellungen = null;
+			}
 
-		if( this.einstellungen != null )
-		{
-			db.remove(this.einstellungen);
-			this.einstellungen = null;
+			db.flush(); //Damit auch wirklich alle Daten weg sind und Hibernate nicht auf dumme Gedanken kommt *sfz*
+			db.remove(this);
+			if(!wasActive) {
+				transaction.commit();
+			}
+		} catch (Exception ex) {
+			if(!wasActive) {
+				transaction.rollback();
+			}
+			throw ex;
 		}
 
-		db.flush(); //Damit auch wirklich alle Daten weg sind und Hibernate nicht auf dumme Gedanken kommt *sfz*
-		db.remove(this);
-
 		this.destroyed = true;
 	}