Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 04:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Update the rename markers

Browse Source
This commit is contained in:
Thinkofdeath 2015-03-19 21:29:12 +00:00
parent 234e60735c
commit 350cb9927e
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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 --- /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-02-26 22:40:22.551608140 +0000 +++ src/main/java/net/minecraft/server/EntityGuardian.java 2015-03-19 21:25:54.134142162 +0000
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
private EntityLiving bo; private EntityLiving bo;
private int bp; private int bp;
private boolean bq; private boolean bq;
- private PathfinderGoalRandomStroll br; - private PathfinderGoalRandomStroll br;
+ public PathfinderGoalRandomStroll br; // CraftBukkit - public + public PathfinderGoalRandomStroll br; // CraftBukkit - public, PAIL: Rename goalRandomStroll
public EntityGuardian(World world) { public EntityGuardian(World world) {
super(world); super(world);

6
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 --- /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-02-26 22:40:22.895608136 +0000 +++ src/main/java/net/minecraft/server/NetworkManager.java 2015-03-19 21:26:27.850141796 +0000
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
private final EnumProtocolDirection h; private final EnumProtocolDirection h;
private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue(); private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue();
private final ReentrantReadWriteLock j = new ReentrantReadWriteLock(); private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
- private Channel k; - private Channel k;
+ public Channel k; // CraftBukkit - public, PAIL: rename + public Channel k; // CraftBukkit - public, PAIL: Rename channel
private SocketAddress l; private SocketAddress l;
private PacketListener m; private PacketListener m;
private IChatBaseComponent n; private IChatBaseComponent n;

8
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 --- /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-02-27 17:23:53.487145868 +0000 +++ src/main/java/net/minecraft/server/PlayerConnection.java 2015-03-19 21:25:54.886142154 +0000
@@ -17,6 +17,48 @@ @@ -17,6 +17,48 @@
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -580,7 +580,7 @@
+ this.server.getPluginManager().callEvent(event); + this.server.getPluginManager().callEvent(event);
+ if (event.isCancelled()) { + if (event.isCancelled()) {
+ this.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex)); + this.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
+ this.player.z(); // PAIL: RENAME + this.player.z(); // PAIL: Rename resetIdleTimer
+ return; + return;
+ } + }
+ // CraftBukkit end + // CraftBukkit end
@ -937,7 +937,7 @@
+ // CraftBukkit end + // CraftBukkit end
} else if (packetplayinuseentity.a() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK) { } 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) {
+ 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.disconnect("Attempting to attack an invalid entity");
this.minecraftServer.warning("Player " + this.player.getName() + " tried to attack an invalid entity"); this.minecraftServer.warning("Player " + this.player.getName() + " tried to attack an invalid entity");
return; return;

6
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 --- /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-01 00:59:18.411214060 +0000 +++ src/main/java/net/minecraft/server/WorldData.java 2015-03-19 21:25:55.170142151 +0000
@@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
package net.minecraft.server; package net.minecraft.server;
@ -63,7 +63,7 @@
public void setDifficulty(EnumDifficulty enumdifficulty) { public void setDifficulty(EnumDifficulty enumdifficulty) {
this.z = enumdifficulty; this.z = enumdifficulty;
+ // CraftBukkit start + // 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) { + for (EntityPlayer player : (java.util.List<EntityPlayer>) (java.util.List) world.players) {
+ player.playerConnection.sendPacket(packet); + player.playerConnection.sendPacket(packet);
+ } + }

16
src/main/java/org/bukkit/craftbukkit/entity/CraftGuardian.java
View File

@ -24,7 +24,7 @@ public class CraftGuardian extends CraftMonster implements Guardian {
@Override @Override
public boolean isElder() { public boolean isElder() {
return ((EntityGuardian)entity).cn(); return ((EntityGuardian)entity).cn(); // PAIL: Rename isElder
} }
@Override @Override
@ -32,22 +32,22 @@ public class CraftGuardian extends CraftMonster implements Guardian {
EntityGuardian entityGuardian = (EntityGuardian) entity; EntityGuardian entityGuardian = (EntityGuardian) entity;
if (!isElder() && shouldBeElder) { if (!isElder() && shouldBeElder) {
entityGuardian.a( true ); entityGuardian.a( true ); // PAIL: Rename setElder
} else if (isElder() && !shouldBeElder) { } else if (isElder() && !shouldBeElder) {
entityGuardian.a( false ); entityGuardian.a( false ); // PAIL: Rename setElder
// Since minecraft does not reset the elder Guardian to a guardian we have to do that // Since minecraft does not reset the elder Guardian to a guardian we have to do that
entity.setSize(0.85F, 0.85F); entity.setSize(0.85F, 0.85F);
// Since aW() calls its supers it will try to re register attributes which is invalid // Since aW() calls its supers it will try to re register attributes which is invalid
// PAIL: rename and check these on update // check these on update
entityGuardian.getAttributeInstance(GenericAttributes.e).setValue(6.0D); entityGuardian.getAttributeInstance(GenericAttributes.e).setValue(6.0D); // PAIL: Rename ATTACK_DAMAGE
entityGuardian.getAttributeInstance(GenericAttributes.d).setValue(0.5D); entityGuardian.getAttributeInstance(GenericAttributes.d).setValue(0.5D); // PAIL: Rename MOVEMENT_SPEED
entityGuardian.getAttributeInstance(GenericAttributes.b).setValue(16.0D); entityGuardian.getAttributeInstance(GenericAttributes.b).setValue(16.0D); // PAIL: Rename FOLLOW_RANGE
entityGuardian.getAttributeInstance(GenericAttributes.maxHealth).setValue(30.0D); entityGuardian.getAttributeInstance(GenericAttributes.maxHealth).setValue(30.0D);
// Update pathfinding (random stroll back to 80) // Update pathfinding (random stroll back to 80)
entityGuardian.br.b(80); entityGuardian.br.b(80); // PAIL: Rename goalRandomStroll.setTimeBetweenMovement
// Tell minecraft that we need persistence since the guardian changed // Tell minecraft that we need persistence since the guardian changed
entityGuardian.initAttributes(); entityGuardian.initAttributes();

2
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -759,7 +759,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return; return;
} }
getHandle().e((Entity) getHandle()); // RENAME getHandle().e((Entity) getHandle()); // PAIL: Rename setSpectatorTarget
getHandle().playerInteractManager.setGameMode(WorldSettings.EnumGamemode.getById(mode.getValue())); getHandle().playerInteractManager.setGameMode(WorldSettings.EnumGamemode.getById(mode.getValue()));
getHandle().fallDistance = 0; getHandle().fallDistance = 0;
getHandle().playerConnection.sendPacket(new PacketPlayOutGameStateChange(3, mode.getValue())); getHandle().playerConnection.sendPacket(new PacketPlayOutGameStateChange(3, mode.getValue()));

2
src/test/java/org/bukkit/PerMaterialTest.java
View File

@ -34,7 +34,7 @@ public class PerMaterialTest extends AbstractTestingBase {
@BeforeClass @BeforeClass
public static void getFireValues() { public static void getFireValues() {
fireValues = Util.getInternalState(BlockFire.class, Blocks.FIRE, "T"); fireValues = Util.getInternalState(BlockFire.class, Blocks.FIRE, "T"); // PAIL: Rename flameChances
} }
@Parameters(name= "{index}: {0}") @Parameters(name= "{index}: {0}")