Use EntityManager for destroying buildings.

sgift · Jul 7, 2024 · 7b76fec · 7b76fec
1 parent d4f82ca
commit 7b76fec
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/game/src/main/java/net/driftingsouls/ds2/server/bases/AcademyBuilding.java b/game/src/main/java/net/driftingsouls/ds2/server/bases/AcademyBuilding.java
@@ -95,7 +95,7 @@ public boolean printHeader() {
 	@Override
 	public void cleanup(Context context, Base base, int building) {
 		super.cleanup(context, base, building);
-		org.hibernate.Session db = context.getDB();
+		var db = context.getEM();
 
 
 		Academy academy = base.getAcademy();
@@ -105,7 +105,7 @@ public void cleanup(Context context, Base base, int building) {
 			academy.getQueueEntries().clear();
 
 			base.setAcademy(null);
-			db.delete(academy);
+			db.remove(academy);
 		}
 
 

diff --git a/game/src/main/java/net/driftingsouls/ds2/server/bases/Fabrik.java b/game/src/main/java/net/driftingsouls/ds2/server/bases/Fabrik.java
@@ -306,7 +306,7 @@ public boolean printHeader()
 	@Override
 	public void cleanup(Context context, Base base, int buildingid)
 	{
-		org.hibernate.Session db = context.getDB();
+		var db = context.getEM();
 
 		Factory wf = loadFactoryEntity(base, buildingid);
 		if (wf == null)
@@ -324,7 +324,7 @@ public void cleanup(Context context, Base base, int buildingid)
 				int id = aPlist.getId();
 				int count = aPlist.getCount();
 
-				FactoryEntry entry = (FactoryEntry) db.get(FactoryEntry.class, id);
+				FactoryEntry entry = db.find(FactoryEntry.class, id);
 
 				usedcapacity = usedcapacity.add(entry.getDauer().multiply(new BigDecimal(count)));
 			}
@@ -338,7 +338,7 @@ public void cleanup(Context context, Base base, int buildingid)
 					int id = plist[i].getId();
 					int count = plist[i].getCount();
 
-					FactoryEntry entry = (FactoryEntry) db.get(FactoryEntry.class, id);
+					FactoryEntry entry = db.find(FactoryEntry.class, id);
 
 					BigDecimal capUsed = new BigDecimal(count).multiply(entry.getDauer());
 
@@ -365,7 +365,7 @@ public void cleanup(Context context, Base base, int buildingid)
 		}
 		else
 		{
-			db.delete(wf);
+			db.remove(wf);
 			base.getFactories().remove(wf);
 		}
 	}

diff --git a/game/src/main/java/net/driftingsouls/ds2/server/bases/ForschungszentrumBuilding.java b/game/src/main/java/net/driftingsouls/ds2/server/bases/ForschungszentrumBuilding.java
@@ -86,8 +86,8 @@ public void cleanup(Context context, Base base, int building) {
 		}
 		base.setForschungszentrum(null);
 
-		org.hibernate.Session db = context.getDB();
-		db.delete(fz);
+		var db = context.getEM();
+		db.remove(fz);
 	}
 
 	@Override

diff --git a/game/src/main/java/net/driftingsouls/ds2/server/bases/KasernenBuilding.java b/game/src/main/java/net/driftingsouls/ds2/server/bases/KasernenBuilding.java
@@ -73,10 +73,10 @@ public void build(Base base, int building) {
 	public void cleanup(Context context, Base base, int building) {
 		super.cleanup(context, base, building);
 
-		org.hibernate.Session db = context.getDB();
-		Kaserne kaserne = (Kaserne)db.createQuery("from Kaserne where base=:base")
-			.setEntity("base", base)
-			.uniqueResult();
+		var db = context.getEM();
+		Kaserne kaserne = db.createQuery("from Kaserne where base=:base", Kaserne.class)
+			.setParameter("base", base)
+			.getSingleResult();
 
 		if( kaserne != null ) {
 			kaserne.destroy();

diff --git a/game/src/main/java/net/driftingsouls/ds2/server/bases/Kommandozentrale.java b/game/src/main/java/net/driftingsouls/ds2/server/bases/Kommandozentrale.java
@@ -78,7 +78,7 @@ public Kommandozentrale() {
 	@Override
 	public void cleanup(Context context, Base base, int building) {
 		super.cleanup(context, base, building);
-		org.hibernate.Session db = context.getDB();
+		var db = context.getEM();
 
 		// Loesche alle GTU-Aktionen
 		base.setAutoGTUActs(new ArrayList<>());
@@ -104,13 +104,13 @@ public void cleanup(Context context, Base base, int building) {
 
 		// Ueberstelle Offiziere
 		db.createQuery("update Offizier set owner=:owner where stationiertAufBasis=:dest")
-		  .setEntity("owner", nullUser)
-		  .setEntity("dest", base)
+		  .setParameter("owner", nullUser)
+				.setParameter("dest", base)
 		  .executeUpdate();
 
 		// Loesche Verbindungen
 		db.createQuery("update ShipWerft set linked=null where linked=:base")
-			.setEntity("base", base)
+			.setParameter("base", base)
 			.executeUpdate();
 
 		// Loesche Eintraege der Basiswerft
@@ -130,14 +130,14 @@ public void cleanup(Context context, Base base, int building) {
 		}
 
 		// Auftraege der Kaserne loeschen
-		Kaserne kaserne = (Kaserne)db.createQuery("from Kaserne where base=:base")
-			.setEntity("base", base)
-			.uniqueResult();
+		Kaserne kaserne = db.createQuery("from Kaserne where base=:base", Kaserne.class)
+			.setParameter("base", base)
+				.getResultList().stream().findFirst().orElse(null);
 
 		if( kaserne != null ) {
 			for( KaserneEntry entry : kaserne.getQueueEntries() )
 			{
-				db.delete(entry);
+				db.remove(entry);
 			}
 		}