Skip to content

Commit 0263886

Browse files
committed
ver si va el ismarried
1 parent f0e607d commit 0263886

File tree

3 files changed

+2
-23
lines changed

3 files changed

+2
-23
lines changed

core/src/main/java/me/matsubara/realisticvillagers/RealisticVillagers.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -801,12 +801,9 @@ public void saveResource(String name) {
801801
if (!file.exists()) saveResource(name, false);
802802
}
803803
//MarriageMaster
804-
805-
806804
private boolean marriedPlayer(@NotNull Player player) {
807805

808806
Plugin marriage = Bukkit.getServer().getPluginManager().getPlugin("MarriageMaster");
809-
if (marriage == null) return false;
810807
return getCompatibilityManager().marriedPlayer(player);
811808
}
812809
public boolean isMarried(@NotNull Player player) {
@@ -820,6 +817,7 @@ public boolean isMarried(@NotNull Player player) {
820817
player.getPersistentDataContainer().remove(marriedWith);
821818
return false;
822819
}
820+
System.out.println("esta casado");
823821

824822
return true;
825823
}

core/src/main/java/me/matsubara/realisticvillagers/compatibility/MarriageCompatibility.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,16 @@
1010

1111
import java.util.UUID;
1212

13-
14-
15-
1613
public class MarriageCompatibility implements Compatibility {
17-
18-
1914
public MarriageMasterPlugin getMarriageMaster() {
2015
Plugin bukkitPlugin = Bukkit.getPluginManager().getPlugin("MarriageMaster");
2116
return (MarriageMasterPlugin) bukkitPlugin;
2217

2318
}
2419
public boolean marriedPlayer(@NotNull Player player) {
25-
2620
UUID playerUUID = player.getUniqueId();
2721
MarriagePlayer data = getMarriageMaster().getPlayerData(playerUUID);
22+
if (data.isMarried() == true) {System.out.println("isMarried: " + data.isMarried());}
2823
return data.isMarried();
2924
}
3025
@Override

core/src/main/java/me/matsubara/realisticvillagers/listener/MarriageListener.java

-14
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,12 @@ private void ForceDivorcewhenmarried(MarriedEvent event) {
3333
VillagerTracker tracker = plugin.getTracker();
3434
INMSConverter converter = plugin.getConverter();
3535

36-
37-
3836
MarriagePlayer marriedplayer1 = event.getPlayer1();
3937
MarriagePlayer marriedplayer2 = event.getPlayer2();
4038

4139
Player player1 = marriedplayer1.getPlayerOnline();
4240
Player player2 = marriedplayer2.getPlayerOnline();
4341

44-
45-
46-
47-
48-
4942
String uuidString1 = player1.getPersistentDataContainer().get(plugin.getMarriedWith(), PersistentDataType.STRING);
5043
if (uuidString1 != null) partnerUUID1 = UUID.fromString(uuidString1);
5144
player1.getPersistentDataContainer().remove(plugin.getMarriedWith());
@@ -54,8 +47,6 @@ private void ForceDivorcewhenmarried(MarriedEvent event) {
5447
if (uuidString2 != null) partnerUUID2 = UUID.fromString(uuidString2);;
5548
player2.getPersistentDataContainer().remove(plugin.getMarriedWith());
5649

57-
58-
5950
for (IVillagerNPC offlineVillager : tracker.getOfflineVillagers()) {
6051
if (!offlineVillager.getUniqueId().equals(partnerUUID1)) continue;
6152

@@ -65,7 +56,6 @@ private void ForceDivorcewhenmarried(MarriedEvent event) {
6556
if (bukkit == null) continue;
6657
}
6758

68-
// In this case, we don't need to ignore invalid villagers.
6959
IVillagerNPC npc = converter.getNPC(bukkit).orElse(null);
7060
if (npc == null) continue;
7161

@@ -81,15 +71,11 @@ private void ForceDivorcewhenmarried(MarriedEvent event) {
8171
if (bukkit == null) continue;
8272
}
8373

84-
// In this case, we don't need to ignore invalid villagers.
8574
IVillagerNPC npc = converter.getNPC(bukkit).orElse(null);
8675
if (npc == null) continue;
8776

8877
npc.divorceAndDropRing(player1);
8978
break;
9079
}
91-
92-
// At this point, either the player or the villager (or both) should be divorced.
93-
9480
}
9581
}

0 commit comments

Comments
 (0)