From 0e1382c71feff9fa0ffd13500d9f093250a8ccf8 Mon Sep 17 00:00:00 2001 From: Yive Date: Thu, 24 Jul 2014 13:58:03 -0700 Subject: [PATCH 1/3] Update to 1.7.10 & make builds save just as... marriage.jar instead of marriage-1-2-4.jar --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f9c9fca..606f9b4 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.bukkit craftbukkit - 1.7.8-R0.1-SNAPSHOT + 1.7.10-R0.1-SNAPSHOT net.milkbowl.vault @@ -71,6 +71,7 @@ clean install + Marriage From 81f2e10ea9ffd3f50cd4dfc35f015fc7379665f6 Mon Sep 17 00:00:00 2001 From: Yive Date: Thu, 24 Jul 2014 13:58:53 -0700 Subject: [PATCH 2/3] Update to 1.7.10 | Marriage.java --- src/main/java/com/lenis0012/bukkit/marriage/Marriage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lenis0012/bukkit/marriage/Marriage.java b/src/main/java/com/lenis0012/bukkit/marriage/Marriage.java index 3f10769..429bb0c 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage/Marriage.java +++ b/src/main/java/com/lenis0012/bukkit/marriage/Marriage.java @@ -44,7 +44,7 @@ public class Marriage extends JavaPlugin { private Map players = new WeakHashMap(); private Updater updater; - public static String COMPAT_VERSION = "v1_7_R3"; + public static String COMPAT_VERSION = "v1_7_R4"; public static boolean IS_COMPATIBLE = true; public Map configs = new HashMap(); From c08b8a2ec673e721f3a4bdb2535b1197fd4cb5f5 Mon Sep 17 00:00:00 2001 From: Yive Date: Thu, 24 Jul 2014 13:59:42 -0700 Subject: [PATCH 3/3] Update to 1.7.10 | PacketUtil.java --- .../bukkit/marriage/util/PacketUtil.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/lenis0012/bukkit/marriage/util/PacketUtil.java b/src/main/java/com/lenis0012/bukkit/marriage/util/PacketUtil.java index a9e48f1..a63be8a 100644 --- a/src/main/java/com/lenis0012/bukkit/marriage/util/PacketUtil.java +++ b/src/main/java/com/lenis0012/bukkit/marriage/util/PacketUtil.java @@ -3,16 +3,16 @@ package com.lenis0012.bukkit.marriage.util; import java.lang.reflect.Field; import java.util.Random; -import net.minecraft.server.v1_7_R3.DataWatcher; -import net.minecraft.server.v1_7_R3.EntityPlayer; -import net.minecraft.server.v1_7_R3.MathHelper; -import net.minecraft.server.v1_7_R3.PacketPlayOutEntityDestroy; -import net.minecraft.server.v1_7_R3.PacketPlayOutEntityStatus; -import net.minecraft.server.v1_7_R3.PacketPlayOutSpawnEntityLiving; -import net.minecraft.server.v1_7_R3.PacketPlayOutWorldParticles; +import net.minecraft.server.v1_7_R4.DataWatcher; +import net.minecraft.server.v1_7_R4.EntityPlayer; +import net.minecraft.server.v1_7_R4.MathHelper; +import net.minecraft.server.v1_7_R4.PacketPlayOutEntityDestroy; +import net.minecraft.server.v1_7_R4.PacketPlayOutEntityStatus; +import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntityLiving; +import net.minecraft.server.v1_7_R4.PacketPlayOutWorldParticles; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.Player; public class PacketUtil {