diff --git a/src/mod/gcewing/sg/event/SGMergeEvent.java b/src/mod/gcewing/sg/event/SGMergeEvent.java index da19c093..bdf4e8b3 100644 --- a/src/mod/gcewing/sg/event/SGMergeEvent.java +++ b/src/mod/gcewing/sg/event/SGMergeEvent.java @@ -11,7 +11,6 @@ public class SGMergeEvent extends Event { Private because the event should be read-only - including both the gatePosition and address in case changes are made to gate address generation */ - private final String worldName; private final BlockPos gatePosition; private final String address; private final boolean merged; @@ -20,24 +19,19 @@ public class SGMergeEvent extends Event { /** * Fired when a Stargate is merged or unmerged (the multiblock structure is completed or broken) */ - public SGMergeEvent(String worldName, String address, boolean merged, BlockPos gatePosition, World world) { - this.worldName = worldName; + public SGMergeEvent(String address, boolean merged, BlockPos gatePosition, World world) { this.gatePosition = gatePosition; this.address = address; this.merged = merged; this.world = world; } - public static SGMergeEvent fireEvent(String worldName, String address, boolean merged, BlockPos gatePosition, World world) { - SGMergeEvent event = new SGMergeEvent(worldName, address, merged, gatePosition, world); + public static SGMergeEvent fireEvent(String address, boolean merged, BlockPos gatePosition, World world) { + SGMergeEvent event = new SGMergeEvent(address, merged, gatePosition, world); MinecraftForge.EVENT_BUS.post(event); return event; } - public String getWorldName() { - return worldName; - } - public BlockPos getGatePosition() { return gatePosition; } diff --git a/src/mod/gcewing/sg/tileentity/SGBaseTE.java b/src/mod/gcewing/sg/tileentity/SGBaseTE.java index f620ee43..c6aad321 100644 --- a/src/mod/gcewing/sg/tileentity/SGBaseTE.java +++ b/src/mod/gcewing/sg/tileentity/SGBaseTE.java @@ -833,7 +833,7 @@ public void setMerged(boolean state) { if (logStargateEvents) { log.info(String.format("STARGATE %s %s %s %s", action, name, pos, address)); } - SGMergeEvent.fireEvent(name, this.homeAddress, isMerged, this.pos, getWorld()); + SGMergeEvent.fireEvent(this.homeAddress, isMerged, this.pos, getWorld()); if (state) { GeneralAddressRegistry.addAddress(world, this.homeAddress); } else {