SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the rename markers

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-03-19 21:29:12 +00:00
parent 3340f8d976
commit 02c89ee898
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
paper-server/nms-patches/EntityGuardian.patch
View File

@@ -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);

6
paper-server/nms-patches/NetworkManager.patch
View File

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

8
paper-server/nms-patches/PlayerConnection.patch
View File

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

6
paper-server/nms-patches/WorldData.patch
View File

@@ -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);
+ }