Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Very quick pass at 1.6.4

  • Loading branch information...
commit dafde0ff87db7074c9114996c0c6b61cb0421e30 1 parent bb46c81
fullwall fullwall authored
Showing with 77 additions and 77 deletions.
  1. BIN  libs/craftbukkit2.jar
  2. +2 −2 src/core/net/citizensnpcs/commands/BasicCommands.java
  3. +1 −1  src/core/net/citizensnpcs/listeners/EntityListen.java
  4. +2 −2 src/core/net/citizensnpcs/properties/properties/BasicProperties.java
  5. +1 −1  src/core/net/citizensnpcs/resources/npclib/AutoPathfinder.java
  6. +6 −6 src/core/net/citizensnpcs/resources/npclib/CraftNPC.java
  7. +1 −1  src/core/net/citizensnpcs/resources/npclib/HumanNPC.java
  8. +2 −2 src/core/net/citizensnpcs/resources/npclib/MinecraftAutoPathfinder.java
  9. +4 −4 src/core/net/citizensnpcs/resources/npclib/NPCAnimator.java
  10. +2 −2 src/core/net/citizensnpcs/resources/npclib/NPCList.java
  11. +1 −1  src/core/net/citizensnpcs/resources/npclib/NPCManager.java
  12. +16 −16 src/core/net/citizensnpcs/resources/npclib/NPCNetHandler.java
  13. +4 −4 src/core/net/citizensnpcs/resources/npclib/NPCNetworkManager.java
  14. +6 −6 src/core/net/citizensnpcs/resources/npclib/NPCSpawner.java
  15. +15 −15 src/core/net/citizensnpcs/resources/npclib/PathNPC.java
  16. +4 −4 src/core/net/citizensnpcs/resources/npclib/creatures/CreatureNPC.java
  17. +3 −3 src/core/net/citizensnpcs/resources/npclib/creatures/CreatureNPCType.java
  18. +4 −4 src/core/net/citizensnpcs/resources/npclib/creatures/EvilCreatureNPC.java
  19. +2 −2 src/core/net/citizensnpcs/utils/PacketUtils.java
  20. +1 −1  src/guard/net/citizensnpcs/guards/Guard.java
BIN  libs/craftbukkit2.jar
View
Binary file not shown
4 src/core/net/citizensnpcs/commands/BasicCommands.java
View
@@ -35,7 +35,7 @@
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
@@ -123,7 +123,7 @@ public static void clean(CommandContext args, CommandSender sender, HumanNPC npc
int count = 0;
for (World world : Bukkit.getServer().getWorlds()) {
for (Entity entity : world.getEntities()) {
- net.minecraft.server.v1_6_R2.Entity mcEntity = ((CraftEntity) entity).getHandle();
+ net.minecraft.server.v1_6_R3.Entity mcEntity = ((CraftEntity) entity).getHandle();
if (!(mcEntity instanceof CraftNPC) || mcEntity instanceof CreatureNPC)
continue;
HumanNPC found = ((CraftNPC) mcEntity).npc;
2  src/core/net/citizensnpcs/listeners/EntityListen.java
View
@@ -14,7 +14,7 @@
import net.citizensnpcs.utils.Messaging;
import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
4 src/core/net/citizensnpcs/properties/properties/BasicProperties.java
View
@@ -27,7 +27,7 @@
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventoryPlayer;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
@@ -89,7 +89,7 @@ private PlayerInventory getInventory(int UID) {
}
}
}
- PlayerInventory inv = new CraftInventoryPlayer(new net.minecraft.server.v1_6_R2.PlayerInventory(null));
+ PlayerInventory inv = new CraftInventoryPlayer(new net.minecraft.server.v1_6_R3.PlayerInventory(null));
ItemStack[] stacks = inv.getContents();
inv.setContents(array.toArray(stacks));
return inv;
2  src/core/net/citizensnpcs/resources/npclib/AutoPathfinder.java
View
@@ -1,6 +1,6 @@
package net.citizensnpcs.resources.npclib;
-import net.minecraft.server.v1_6_R2.PathEntity;
+import net.minecraft.server.v1_6_R3.PathEntity;
public interface AutoPathfinder {
PathEntity find(PathNPC npc);
12 src/core/net/citizensnpcs/resources/npclib/CraftNPC.java
View
@@ -3,12 +3,12 @@
import java.io.IOException;
import net.citizensnpcs.resources.npclib.NPCAnimator.Animation;
-import net.minecraft.server.v1_6_R2.Connection;
-import net.minecraft.server.v1_6_R2.EnumGamemode;
-import net.minecraft.server.v1_6_R2.MinecraftServer;
-import net.minecraft.server.v1_6_R2.NetworkManager;
-import net.minecraft.server.v1_6_R2.PlayerInteractManager;
-import net.minecraft.server.v1_6_R2.World;
+import net.minecraft.server.v1_6_R3.Connection;
+import net.minecraft.server.v1_6_R3.EnumGamemode;
+import net.minecraft.server.v1_6_R3.MinecraftServer;
+import net.minecraft.server.v1_6_R3.NetworkManager;
+import net.minecraft.server.v1_6_R3.PlayerInteractManager;
+import net.minecraft.server.v1_6_R3.World;
import org.bukkit.entity.LivingEntity;
2  src/core/net/citizensnpcs/resources/npclib/HumanNPC.java
View
@@ -13,7 +13,7 @@
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDeathEvent;
4 src/core/net/citizensnpcs/resources/npclib/MinecraftAutoPathfinder.java
View
@@ -2,8 +2,8 @@
import java.util.Random;
-import net.minecraft.server.v1_6_R2.MathHelper;
-import net.minecraft.server.v1_6_R2.PathEntity;
+import net.minecraft.server.v1_6_R3.MathHelper;
+import net.minecraft.server.v1_6_R3.PathEntity;
public class MinecraftAutoPathfinder implements AutoPathfinder {
private final Random random = new Random();
8 src/core/net/citizensnpcs/resources/npclib/NPCAnimator.java
View
@@ -1,10 +1,10 @@
package net.citizensnpcs.resources.npclib;
import net.citizensnpcs.utils.PacketUtils;
-import net.minecraft.server.v1_6_R2.DataWatcher;
-import net.minecraft.server.v1_6_R2.Packet17EntityLocationAction;
-import net.minecraft.server.v1_6_R2.Packet18ArmAnimation;
-import net.minecraft.server.v1_6_R2.Packet40EntityMetadata;
+import net.minecraft.server.v1_6_R3.DataWatcher;
+import net.minecraft.server.v1_6_R3.Packet17EntityLocationAction;
+import net.minecraft.server.v1_6_R3.Packet18ArmAnimation;
+import net.minecraft.server.v1_6_R3.Packet40EntityMetadata;
import org.bukkit.Location;
import org.bukkit.entity.Player;
4 src/core/net/citizensnpcs/resources/npclib/NPCList.java
View
@@ -2,7 +2,7 @@
import java.util.concurrent.ConcurrentHashMap;
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity;
import org.bukkit.entity.Entity;
public class NPCList extends ConcurrentHashMap<Integer, HumanNPC> {
@@ -14,7 +14,7 @@ public HumanNPC getNPC(Entity entity) {
if (entity == null) {
return null;
}
- net.minecraft.server.v1_6_R2.Entity mcEntity = ((CraftEntity) entity).getHandle();
+ net.minecraft.server.v1_6_R3.Entity mcEntity = ((CraftEntity) entity).getHandle();
if (mcEntity instanceof CraftNPC) {
HumanNPC npc = ((CraftNPC) mcEntity).npc;
if (npc == null)
2  src/core/net/citizensnpcs/resources/npclib/NPCManager.java
View
@@ -13,7 +13,7 @@
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
32 src/core/net/citizensnpcs/resources/npclib/NPCNetHandler.java
View
@@ -1,21 +1,21 @@
package net.citizensnpcs.resources.npclib;
-import net.minecraft.server.v1_6_R2.EntityPlayer;
-import net.minecraft.server.v1_6_R2.MinecraftServer;
-import net.minecraft.server.v1_6_R2.NetworkManager;
-import net.minecraft.server.v1_6_R2.Packet;
-import net.minecraft.server.v1_6_R2.Packet102WindowClick;
-import net.minecraft.server.v1_6_R2.Packet106Transaction;
-import net.minecraft.server.v1_6_R2.Packet10Flying;
-import net.minecraft.server.v1_6_R2.Packet130UpdateSign;
-import net.minecraft.server.v1_6_R2.Packet14BlockDig;
-import net.minecraft.server.v1_6_R2.Packet15Place;
-import net.minecraft.server.v1_6_R2.Packet16BlockItemSwitch;
-import net.minecraft.server.v1_6_R2.Packet255KickDisconnect;
-import net.minecraft.server.v1_6_R2.Packet28EntityVelocity;
-import net.minecraft.server.v1_6_R2.Packet3Chat;
-import net.minecraft.server.v1_6_R2.Packet51MapChunk;
-import net.minecraft.server.v1_6_R2.PlayerConnection;
+import net.minecraft.server.v1_6_R3.EntityPlayer;
+import net.minecraft.server.v1_6_R3.MinecraftServer;
+import net.minecraft.server.v1_6_R3.NetworkManager;
+import net.minecraft.server.v1_6_R3.Packet;
+import net.minecraft.server.v1_6_R3.Packet102WindowClick;
+import net.minecraft.server.v1_6_R3.Packet106Transaction;
+import net.minecraft.server.v1_6_R3.Packet10Flying;
+import net.minecraft.server.v1_6_R3.Packet130UpdateSign;
+import net.minecraft.server.v1_6_R3.Packet14BlockDig;
+import net.minecraft.server.v1_6_R3.Packet15Place;
+import net.minecraft.server.v1_6_R3.Packet16BlockItemSwitch;
+import net.minecraft.server.v1_6_R3.Packet255KickDisconnect;
+import net.minecraft.server.v1_6_R3.Packet28EntityVelocity;
+import net.minecraft.server.v1_6_R3.Packet3Chat;
+import net.minecraft.server.v1_6_R3.Packet51MapChunk;
+import net.minecraft.server.v1_6_R3.PlayerConnection;
public class NPCNetHandler extends PlayerConnection {
public NPCNetHandler(MinecraftServer minecraftserver, EntityPlayer entityplayer, NetworkManager netMgr) {
8 src/core/net/citizensnpcs/resources/npclib/NPCNetworkManager.java
View
@@ -5,10 +5,10 @@
import java.net.Socket;
import java.security.PrivateKey;
-import net.minecraft.server.v1_6_R2.Connection;
-import net.minecraft.server.v1_6_R2.IConsoleLogManager;
-import net.minecraft.server.v1_6_R2.NetworkManager;
-import net.minecraft.server.v1_6_R2.Packet;
+import net.minecraft.server.v1_6_R3.Connection;
+import net.minecraft.server.v1_6_R3.IConsoleLogManager;
+import net.minecraft.server.v1_6_R3.NetworkManager;
+import net.minecraft.server.v1_6_R3.Packet;
public class NPCNetworkManager extends NetworkManager {
public NPCNetworkManager(IConsoleLogManager mgr, Socket paramSocket, String paramString,
12 src/core/net/citizensnpcs/resources/npclib/NPCSpawner.java
View
@@ -6,16 +6,16 @@
import net.citizensnpcs.resources.npclib.creatures.CreatureNPCType;
import net.citizensnpcs.utils.Messaging;
import net.citizensnpcs.utils.PacketUtils;
-import net.minecraft.server.v1_6_R2.MinecraftServer;
-import net.minecraft.server.v1_6_R2.Packet29DestroyEntity;
-import net.minecraft.server.v1_6_R2.PlayerInteractManager;
-import net.minecraft.server.v1_6_R2.World;
+import net.minecraft.server.v1_6_R3.MinecraftServer;
+import net.minecraft.server.v1_6_R3.Packet29DestroyEntity;
+import net.minecraft.server.v1_6_R3.PlayerInteractManager;
+import net.minecraft.server.v1_6_R3.World;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
public class NPCSpawner {
public static void despawnNPC(CraftNPC npc, NPCRemoveReason reason) {
30 src/core/net/citizensnpcs/resources/npclib/PathNPC.java
View
@@ -5,21 +5,21 @@
import net.citizensnpcs.resources.npclib.NPCAnimator.Animation;
import net.citizensnpcs.resources.npclib.creatures.CreatureNPC;
import net.citizensnpcs.utils.PacketUtils;
-import net.minecraft.server.v1_6_R2.Entity;
-import net.minecraft.server.v1_6_R2.EntityHuman;
-import net.minecraft.server.v1_6_R2.EntityPlayer;
-import net.minecraft.server.v1_6_R2.GenericAttributes;
-import net.minecraft.server.v1_6_R2.MathHelper;
-import net.minecraft.server.v1_6_R2.MinecraftServer;
-import net.minecraft.server.v1_6_R2.Packet5EntityEquipment;
-import net.minecraft.server.v1_6_R2.PathEntity;
-import net.minecraft.server.v1_6_R2.PlayerInteractManager;
-import net.minecraft.server.v1_6_R2.Vec3D;
-import net.minecraft.server.v1_6_R2.World;
+import net.minecraft.server.v1_6_R3.Entity;
+import net.minecraft.server.v1_6_R3.EntityHuman;
+import net.minecraft.server.v1_6_R3.EntityPlayer;
+import net.minecraft.server.v1_6_R3.GenericAttributes;
+import net.minecraft.server.v1_6_R3.MathHelper;
+import net.minecraft.server.v1_6_R3.MinecraftServer;
+import net.minecraft.server.v1_6_R3.Packet5EntityEquipment;
+import net.minecraft.server.v1_6_R3.PathEntity;
+import net.minecraft.server.v1_6_R3.PlayerInteractManager;
+import net.minecraft.server.v1_6_R3.Vec3D;
+import net.minecraft.server.v1_6_R3.World;
import org.bukkit.Location;
import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftLivingEntity;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
@@ -40,7 +40,7 @@
protected float pathingRange = 16;
private int pathTickLimit = -1;
private int pathTicks = 0;
- private final net.minecraft.server.v1_6_R2.ItemStack[] previousEquipment = { null, null, null, null, null };
+ private final net.minecraft.server.v1_6_R3.ItemStack[] previousEquipment = { null, null, null, null, null };
private int prevX, prevY, prevZ;
protected boolean randomPather = false;
private int stationaryTickLimit = -1;
@@ -299,8 +299,8 @@ public boolean toggleAutoPathfinder() {
private void updateEquipment() {
for (int i = 0; i < previousEquipment.length; i++) {
- net.minecraft.server.v1_6_R2.ItemStack previous = previousEquipment[i];
- net.minecraft.server.v1_6_R2.ItemStack current = getEquipment(i);
+ net.minecraft.server.v1_6_R3.ItemStack previous = previousEquipment[i];
+ net.minecraft.server.v1_6_R3.ItemStack current = getEquipment(i);
if (previous != current) {
PacketUtils.sendPacketNearby(getBukkitEntity().getLocation(), 64, new Packet5EntityEquipment(id, i,
current));
8 src/core/net/citizensnpcs/resources/npclib/creatures/CreatureNPC.java
View
@@ -1,12 +1,12 @@
package net.citizensnpcs.resources.npclib.creatures;
import net.citizensnpcs.resources.npclib.CraftNPC;
-import net.minecraft.server.v1_6_R2.MinecraftServer;
-import net.minecraft.server.v1_6_R2.PlayerInteractManager;
-import net.minecraft.server.v1_6_R2.World;
+import net.minecraft.server.v1_6_R3.MinecraftServer;
+import net.minecraft.server.v1_6_R3.PlayerInteractManager;
+import net.minecraft.server.v1_6_R3.World;
import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
6 src/core/net/citizensnpcs/resources/npclib/creatures/CreatureNPCType.java
View
@@ -10,9 +10,9 @@
import net.citizensnpcs.resources.npclib.HumanNPC;
import net.citizensnpcs.utils.Messaging;
import net.citizensnpcs.utils.StringUtils;
-import net.minecraft.server.v1_6_R2.MinecraftServer;
-import net.minecraft.server.v1_6_R2.PlayerInteractManager;
-import net.minecraft.server.v1_6_R2.World;
+import net.minecraft.server.v1_6_R3.MinecraftServer;
+import net.minecraft.server.v1_6_R3.PlayerInteractManager;
+import net.minecraft.server.v1_6_R3.World;
import org.bukkit.Location;
8 src/core/net/citizensnpcs/resources/npclib/creatures/EvilCreatureNPC.java
View
@@ -10,10 +10,10 @@
import net.citizensnpcs.utils.MessageUtils;
import net.citizensnpcs.utils.Messaging;
import net.citizensnpcs.utils.StringUtils;
-import net.minecraft.server.v1_6_R2.EntityHuman;
-import net.minecraft.server.v1_6_R2.MinecraftServer;
-import net.minecraft.server.v1_6_R2.PlayerInteractManager;
-import net.minecraft.server.v1_6_R2.World;
+import net.minecraft.server.v1_6_R3.EntityHuman;
+import net.minecraft.server.v1_6_R3.MinecraftServer;
+import net.minecraft.server.v1_6_R3.PlayerInteractManager;
+import net.minecraft.server.v1_6_R3.World;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
4 src/core/net/citizensnpcs/utils/PacketUtils.java
View
@@ -1,11 +1,11 @@
package net.citizensnpcs.utils;
-import net.minecraft.server.v1_6_R2.Packet;
+import net.minecraft.server.v1_6_R3.Packet;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
public class PacketUtils {
2  src/guard/net/citizensnpcs/guards/Guard.java
View
@@ -14,7 +14,7 @@
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
Please sign in to comment.
Something went wrong with that request. Please try again.