twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-31 04:13:51 -07:00
Code Issues Packages 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ public class CraftGuardian extends CraftMonster implements Guardian {
@Override
public boolean isElder() {
return ((EntityGuardian)entity).cn();
return ((EntityGuardian)entity).cn(); // PAIL: Rename isElder
}
@Override
@@ -32,22 +32,22 @@ public class CraftGuardian extends CraftMonster implements Guardian {
EntityGuardian entityGuardian = (EntityGuardian) entity;
if (!isElder() && shouldBeElder) {
entityGuardian.a( true );
entityGuardian.a( true ); // PAIL: Rename setElder
} 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
entity.setSize(0.85F, 0.85F);
// Since aW() calls its supers it will try to re register attributes which is invalid
// PAIL: rename and check these on update
entityGuardian.getAttributeInstance(GenericAttributes.e).setValue(6.0D);
entityGuardian.getAttributeInstance(GenericAttributes.d).setValue(0.5D);
entityGuardian.getAttributeInstance(GenericAttributes.b).setValue(16.0D);
// check these on update
entityGuardian.getAttributeInstance(GenericAttributes.e).setValue(6.0D); // PAIL: Rename ATTACK_DAMAGE
entityGuardian.getAttributeInstance(GenericAttributes.d).setValue(0.5D); // PAIL: Rename MOVEMENT_SPEED
entityGuardian.getAttributeInstance(GenericAttributes.b).setValue(16.0D); // PAIL: Rename FOLLOW_RANGE
entityGuardian.getAttributeInstance(GenericAttributes.maxHealth).setValue(30.0D);
// 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
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;
}
getHandle().e((Entity) getHandle()); // RENAME
getHandle().e((Entity) getHandle()); // PAIL: Rename setSpectatorTarget
getHandle().playerInteractManager.setGameMode(WorldSettings.EnumGamemode.getById(mode.getValue()));
getHandle().fallDistance = 0;
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
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}")