TotalFreedomMC/TF-Marriage
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-Marriage.git synced 2024-12-31 20:42:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12 from Yive/patch-3

Browse source 
Update to 1.7.10
This commit is contained in:
lenis0012 2014-07-25 16:38:33 +02:00
commit ad07253c2e
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pom.xml
View file

@ -31,7 +31,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.7.8-R0.1-SNAPSHOT</version>
<version>1.7.10-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.milkbowl.vault</groupId>
@ -71,6 +71,7 @@
</resource>
</resources>
<defaultGoal>clean install</defaultGoal>
<finalName>Marriage</finalName>
<!-- Plugins -->
<plugins>
<!-- Compiler plugin -->

2
src/main/java/com/lenis0012/bukkit/marriage/Marriage.java
View file

@ -45,7 +45,7 @@ public class Marriage extends JavaPlugin {
private Map<String, MPlayer> players = new WeakHashMap<String, MPlayer>();
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<String, PlayerConfig> configs = new HashMap<String, PlayerConfig>();

16
src/main/java/com/lenis0012/bukkit/marriage/util/PacketUtil.java
View file

@ -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 {