mirror of
https://github.com/TotalFreedomMC/TF-Marriage.git
synced 2025-02-05 14:22:45 +00:00
Stablebuild
This commit is contained in:
Lennart ten Wolde
parent
ca70438fd3
commit
cb39936fb1
8 changed files with 25 additions and 18 deletions
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "Marriage v2.0.5",
|
||||
"name": "Marriage v2.0.6",
|
||||
"type": "release",
|
||||
"gameVersion": "1.8.8",
|
||||
"downloadURL": "http://ci.lenis0012.com/job/Marriage/33/artifact/target/Marriage-Spigot-2.0.5.jar"
|
||||
"downloadURL": "http://ci.lenis0012.com/job/Marriage/37/artifact/target/Marriage-Spigot-2.0.6.jar"
|
||||
}
|
||||
4
pom.xml
4
pom.xml
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<groupId>com.lenis0012.bukkit</groupId>
|
||||
<artifactId>marriage2</artifactId>
|
||||
<version>2.0.6-SNAPSHOT</version>
|
||||
<version>2.0.6</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>Marriage</name>
|
||||
<url>http://dev.bukkit.org/server-mods/marriage-reloaded/</url>
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
<showWarnings>true</showWarnings>
|
||||
<showDeprecation>true</showDeprecation>
|
||||
<showDeprecation>false</showDeprecation> <!-- TODO: Change back to true when setItemInHand fixed -->
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@ public class CommandHelp extends Command {
|
|||
status = String.format(Message.MARRIED_TO.toString(), partner);
|
||||
}
|
||||
reply(Message.STATUS, status);
|
||||
System.out.println(Message.STATUS);
|
||||
reply("&2&m--------------------------------------------"); // Play around with the amount of dashes later
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ import com.lenis0012.bukkit.marriage2.internal.Register.Type;
|
|||
import com.lenis0012.bukkit.marriage2.internal.data.DataConverter;
|
||||
import com.lenis0012.updater.api.Updater;
|
||||
import com.lenis0012.updater.api.UpdaterFactory;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.Listener;
|
||||
|
||||
import com.lenis0012.bukkit.marriage2.MPlayer;
|
||||
|
|
@ -49,6 +51,12 @@ public class MarriageCore extends MarriageBase {
|
|||
@Register(name = "database", type = Register.Type.ENABLE)
|
||||
public void loadDatabase() {
|
||||
this.dataManager = new DataManager(this);
|
||||
|
||||
// Load all players
|
||||
for(Player player : Bukkit.getOnlinePlayers()) {
|
||||
MarriagePlayer mp = dataManager.loadPlayer(player.getUniqueId());
|
||||
setMPlayer(player.getUniqueId(), mp);
|
||||
}
|
||||
}
|
||||
|
||||
@Register(name = "listeners", type = Register.Type.ENABLE)
|
||||
|
|
@ -116,6 +124,10 @@ public class MarriageCore extends MarriageBase {
|
|||
players.put(uuid, mp);
|
||||
}
|
||||
|
||||
public boolean isMPlayerSet(UUID uuid) {
|
||||
return players.containsKey(uuid);
|
||||
}
|
||||
|
||||
public DataManager getDataManager() {
|
||||
return dataManager;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ public class DataManager {
|
|||
UUID partnerId = UUID.fromString(result.getString(alt ? "player1" : "player2"));
|
||||
Player partner = Bukkit.getPlayer(partnerId);
|
||||
MarriageData data;
|
||||
if(partner != null && partner.isOnline()) {
|
||||
if(partner != null && partner.isOnline() && core.isMPlayerSet(partner.getUniqueId())) {
|
||||
// Copy marriage data from partner to ensure a match.
|
||||
data = (MarriageData) core.getMPlayer(partnerId).getMarriage();
|
||||
} else if((data = marriageDataCache.getIfPresent(player.getUniqueId())) == null){
|
||||
|
|
|
|||
|
|
@ -109,7 +109,6 @@ public class MarriageData implements MData {
|
|||
|
||||
@Override
|
||||
public UUID getOtherPlayer(UUID me) {
|
||||
System.out.println(player1.toString() + " - " + player2.toString() + " > " + me.toString());
|
||||
return me.toString().equalsIgnoreCase(player1.toString()) ? player2 : player1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,10 +7,7 @@ import com.lenis0012.bukkit.marriage2.internal.MarriageCore;
|
|||
import com.lenis0012.bukkit.marriage2.misc.Cooldown;
|
||||
import com.lenis0012.bukkit.marriage2.misc.reflection.Packets;
|
||||
import com.lenis0012.bukkit.marriage2.misc.reflection.Reflection;
|
||||
import net.minecraft.server.v1_8_R3.EnumParticle;
|
||||
import net.minecraft.server.v1_8_R3.PacketPlayOutWorldParticles;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
|
|
@ -73,7 +70,7 @@ public class KissListener implements Listener {
|
|||
int max = Settings.KISSES_AMOUNT_MAX.value();
|
||||
int amount = min + random.nextInt(max - min + 1);
|
||||
Object packet = Packets.createPacket("PacketPlayOutWorldParticles");
|
||||
Packets.set(packet, "a", Reflection.invokeMethod(int.class, GET_PARTICLE_BY_ID, null, 34));
|
||||
Packets.set(packet, "a", Reflection.invokeMethod(GET_PARTICLE_BY_ID, null, 34));
|
||||
Packets.set(packet, "b", (float) l.getX());
|
||||
Packets.set(packet, "c", (float) l.getY());
|
||||
Packets.set(packet, "d", (float) l.getZ());
|
||||
|
|
|
|||
|
|
@ -1,28 +1,28 @@
|
|||
{
|
||||
"version": "Marriage v2.0.5",
|
||||
"version": "Marriage v2.0.6",
|
||||
"data":
|
||||
[
|
||||
[
|
||||
"---[ Changelog ]---",
|
||||
"",
|
||||
"- Add support for reload",
|
||||
"- Added 1.9/8 support",
|
||||
"",
|
||||
"- Fixed status in help command",
|
||||
"- Fixed error on reload",
|
||||
"",
|
||||
"- Added tag {partner} to chat format"
|
||||
"- Fixed db error on first use"
|
||||
],
|
||||
[
|
||||
"====[ DONATE ]====",
|
||||
"",
|
||||
"Make minecraft great again",
|
||||
"$1 = 1 TRUMP VOTE",
|
||||
"Donate please :)",
|
||||
"$1 = 1 HUG",
|
||||
"",
|
||||
"paypal.me/lenis0012",
|
||||
"=====[ SOCIAL ]=====",
|
||||
"IGN: lenis",
|
||||
"Twitter: @lenis0012",
|
||||
"",
|
||||
"Report bugs!",
|
||||
"Report hugs!",
|
||||
"-lenis"
|
||||
]
|
||||
]
|
||||
|
|
|
|||
Loading…
Reference in a new issue