Merge pull request #7 from Yive/master

Simple fix for kissing in 1.7.5
This commit is contained in:
lenis0012 2014-04-05 22:42:12 +02:00
commit 42585ffb9f
2 changed files with 9 additions and 9 deletions

View file

@ -44,7 +44,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_R1";
public static String COMPAT_VERSION = "v1_7_R2";
public static boolean IS_COMPATIBLE = true;
public Map<String, PlayerConfig> configs = new HashMap<String, PlayerConfig>();

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_R1.DataWatcher;
import net.minecraft.server.v1_7_R1.EntityPlayer;
import net.minecraft.server.v1_7_R1.MathHelper;
import net.minecraft.server.v1_7_R1.PacketPlayOutEntityDestroy;
import net.minecraft.server.v1_7_R1.PacketPlayOutEntityStatus;
import net.minecraft.server.v1_7_R1.PacketPlayOutSpawnEntityLiving;
import net.minecraft.server.v1_7_R1.PacketPlayOutWorldParticles;
import net.minecraft.server.v1_7_R2.DataWatcher;
import net.minecraft.server.v1_7_R2.EntityPlayer;
import net.minecraft.server.v1_7_R2.MathHelper;
import net.minecraft.server.v1_7_R2.PacketPlayOutEntityDestroy;
import net.minecraft.server.v1_7_R2.PacketPlayOutEntityStatus;
import net.minecraft.server.v1_7_R2.PacketPlayOutSpawnEntityLiving;
import net.minecraft.server.v1_7_R2.PacketPlayOutWorldParticles;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
public class PacketUtil {