Fix: ServerRMI interface bug

This commit is contained in:
2026-05-05 16:46:55 +02:00
parent b5d0f70b41
commit 20ba64ea46
5 changed files with 97 additions and 61 deletions
@@ -5,6 +5,7 @@ import it.polimi.ingsw.gc14.Network.IClient;
import it.polimi.ingsw.gc14.Network.NetworkEvents.*;
import it.polimi.ingsw.gc14.View.IView;
import java.rmi.RemoteException;
import java.util.Objects;
/**
@@ -77,7 +78,11 @@ public class ClientController {
}
else
{
client.drawUpperTribeCard(playerUsername, pos);
try {
client.drawUpperTribeCard(playerUsername, pos);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
}
@@ -92,7 +97,11 @@ public class ClientController {
if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName()))
view.showError("It's not your turn!");
else
client.drawLowerTribeCard(playerUsername,pos);
try {
client.drawLowerTribeCard(playerUsername, pos);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
@@ -105,8 +114,13 @@ public class ClientController {
public void drawUpperBuildingCard(String playerUsername,int pos) {
if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName()))
view.showError("It's not your turn!");
else
client.drawUpperBuildingCard(playerUsername,pos);
else {
try {
client.drawUpperBuildingCard(playerUsername,pos);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
}
@@ -120,8 +134,13 @@ public class ClientController {
public void drawLowerBuildingCard(String playerUsername,int pos) {
if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName()))
view.showError("It's not your turn!");
else
client.drawLowerBuildingCard(playerUsername,pos);
else {
try {
client.drawLowerBuildingCard(playerUsername,pos);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
}
@@ -133,8 +152,13 @@ public class ClientController {
public void skipUpper(String playerUsername) {
if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName()))
view.showError("It's not your turn!");
else
client.skipUpper(playerUsername);
else {
try {
client.skipUpper(playerUsername);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
}
@@ -146,8 +170,13 @@ public class ClientController {
public void skipLower(String playerUsername) {
if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName()))
view.showError("It's not your turn!");
else
client.skipLower(playerUsername);
else {
try {
client.skipLower(playerUsername);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
}
@@ -160,8 +189,13 @@ public class ClientController {
public void pickOptionalTribeCard(String playerUsername,int pos) {
if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName()))
view.showError("It's not your turn!");
else
client.pickOptionalTribeCard(playerUsername,pos);
else {
try {
client.pickOptionalTribeCard(playerUsername,pos);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
}
@@ -174,8 +208,13 @@ public class ClientController {
public void pickOptionalBuildingCard(String playerUsername,int pos) {
if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName()))
view.showError("It's not your turn!");
else
client.pickOptionalBuildingCard(playerUsername,pos);
else {
try {
client.pickOptionalBuildingCard(playerUsername,pos);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
}
@@ -187,8 +226,13 @@ public class ClientController {
public void noOptionalCard(String playerUsername) {
if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName()))
view.showError("It's not your turn!");
else
client.noOptionalCard(playerUsername);
else {
try {
client.noOptionalCard(playerUsername);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
}
@@ -200,8 +244,13 @@ public class ClientController {
public void slotChoice(String playerUsername,int pos) {
if(!Objects.equals(playerUsername, localController.getModel().getCurrentState().getCurrentPlayer().getUserName()))
view.showError("It's not your turn!");
else
client.slotChoice(playerUsername,pos);
else {
try {
client.slotChoice(playerUsername,pos);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
}
}