diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-19 21:29:12 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-19 21:29:33 +0000 |
| commit | 350cb9927ec1feb83d20a5059f3c5199f27f071f (patch) | |
| tree | 2a943b8b106371a55ecf1f47bb6b65a5b4289824 /nms-patches | |
| parent | 234e60735ca6f4ecb7e56996c95ea31b5bb97cc0 (diff) | |
| download | craftbukkit-350cb9927ec1feb83d20a5059f3c5199f27f071f.tar craftbukkit-350cb9927ec1feb83d20a5059f3c5199f27f071f.tar.gz craftbukkit-350cb9927ec1feb83d20a5059f3c5199f27f071f.tar.lz craftbukkit-350cb9927ec1feb83d20a5059f3c5199f27f071f.tar.xz craftbukkit-350cb9927ec1feb83d20a5059f3c5199f27f071f.zip | |
Update the rename markers
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityGuardian.patch | 6 | ||||
| -rw-r--r-- | nms-patches/NetworkManager.patch | 6 | ||||
| -rw-r--r-- | nms-patches/PlayerConnection.patch | 8 | ||||
| -rw-r--r-- | nms-patches/WorldData.patch | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/nms-patches/EntityGuardian.patch b/nms-patches/EntityGuardian.patch index cd30ff32..b8f55e35 100644 --- a/nms-patches/EntityGuardian.patch +++ b/nms-patches/EntityGuardian.patch @@ -1,11 +1,11 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/EntityGuardian.java 2015-02-26 22:40:22.551608140 +0000 -+++ src/main/java/net/minecraft/server/EntityGuardian.java 2015-02-26 22:40:22.551608140 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/EntityGuardian.java 2015-03-19 21:25:54.134142162 +0000 ++++ src/main/java/net/minecraft/server/EntityGuardian.java 2015-03-19 21:25:54.134142162 +0000 @@ -14,7 +14,7 @@ private EntityLiving bo; private int bp; private boolean bq; - private PathfinderGoalRandomStroll br; -+ public PathfinderGoalRandomStroll br; // CraftBukkit - public ++ public PathfinderGoalRandomStroll br; // CraftBukkit - public, PAIL: Rename goalRandomStroll public EntityGuardian(World world) { super(world); diff --git a/nms-patches/NetworkManager.patch b/nms-patches/NetworkManager.patch index 1379f171..70ba4ac0 100644 --- a/nms-patches/NetworkManager.patch +++ b/nms-patches/NetworkManager.patch @@ -1,11 +1,11 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/NetworkManager.java 2015-02-26 22:40:22.895608136 +0000 -+++ src/main/java/net/minecraft/server/NetworkManager.java 2015-02-26 22:40:22.895608136 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/NetworkManager.java 2015-03-19 21:26:27.850141796 +0000 ++++ src/main/java/net/minecraft/server/NetworkManager.java 2015-03-19 21:26:27.850141796 +0000 @@ -63,7 +63,7 @@ private final EnumProtocolDirection h; private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue(); private final ReentrantReadWriteLock j = new ReentrantReadWriteLock(); - private Channel k; -+ public Channel k; // CraftBukkit - public, PAIL: rename ++ public Channel k; // CraftBukkit - public, PAIL: Rename channel private SocketAddress l; private PacketListener m; private IChatBaseComponent n; diff --git a/nms-patches/PlayerConnection.patch b/nms-patches/PlayerConnection.patch index 1ef08855..ca489815 100644 --- a/nms-patches/PlayerConnection.patch +++ b/nms-patches/PlayerConnection.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/PlayerConnection.java 2015-02-27 17:23:53.483145868 +0000 -+++ src/main/java/net/minecraft/server/PlayerConnection.java 2015-02-27 17:23:53.487145868 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/PlayerConnection.java 2015-03-19 21:25:54.882142154 +0000 ++++ src/main/java/net/minecraft/server/PlayerConnection.java 2015-03-19 21:25:54.886142154 +0000 @@ -17,6 +17,48 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -580,7 +580,7 @@ + this.server.getPluginManager().callEvent(event); + if (event.isCancelled()) { + this.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex)); -+ this.player.z(); // PAIL: RENAME ++ this.player.z(); // PAIL: Rename resetIdleTimer + return; + } + // CraftBukkit end @@ -937,7 +937,7 @@ + // CraftBukkit end } else if (packetplayinuseentity.a() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK) { - if (entity instanceof EntityItem || entity instanceof EntityExperienceOrb || entity instanceof EntityArrow || entity == this.player) { -+ if (entity instanceof EntityItem || entity instanceof EntityExperienceOrb || entity instanceof EntityArrow || (entity == this.player && !player.v())) { // CraftBukkit, PAIL: RENAME ++ if (entity instanceof EntityItem || entity instanceof EntityExperienceOrb || entity instanceof EntityArrow || (entity == this.player && !player.v())) { // CraftBukkit, PAIL: Rename isSpectator this.disconnect("Attempting to attack an invalid entity"); this.minecraftServer.warning("Player " + this.player.getName() + " tried to attack an invalid entity"); return; diff --git a/nms-patches/WorldData.patch b/nms-patches/WorldData.patch index 07e5410f..a45ed3fc 100644 --- a/nms-patches/WorldData.patch +++ b/nms-patches/WorldData.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/WorldData.java 2015-03-01 00:59:18.411214060 +0000 -+++ src/main/java/net/minecraft/server/WorldData.java 2015-03-01 00:59:18.411214060 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/WorldData.java 2015-03-19 21:25:55.170142151 +0000 ++++ src/main/java/net/minecraft/server/WorldData.java 2015-03-19 21:25:55.170142151 +0000 @@ -1,6 +1,11 @@ package net.minecraft.server; @@ -63,7 +63,7 @@ public void setDifficulty(EnumDifficulty enumdifficulty) { this.z = enumdifficulty; + // CraftBukkit start -+ PacketPlayOutServerDifficulty packet = new PacketPlayOutServerDifficulty(this.y(), this.z()); // PAIL: Rename ++ PacketPlayOutServerDifficulty packet = new PacketPlayOutServerDifficulty(this.y(), this.z()); // PAIL: Rename getDifficulty, isDifficultyLocked + for (EntityPlayer player : (java.util.List<EntityPlayer>) (java.util.List) world.players) { + player.playerConnection.sendPacket(packet); + } |