mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-15 20:23:53 -07:00
Clean up a lot of obfuscation helpers and impls
This fixes a bug with obfuscation helpers for attack cooldown But every other change should stay the same. Cleaning up a lot of helpers that pointed to already unobfuscated items. Also adds final to many of the obfhelpers to assist with inlining. This is pretty much a patch maintenance
This commit is contained in:
@@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
return this.world.isRainingAt(blockposition) || this.world.isRainingAt(blockposition.a(0.0D, (double) this.size.height, 0.0D));
|
||||
}
|
||||
|
||||
+ public boolean isInBubbleColumn() { return k(); } // Paper - OBFHELPER
|
||||
+ public final boolean isInBubbleColumn() { return k(); } // Paper - OBFHELPER
|
||||
private boolean k() {
|
||||
return this.world.getType(this.getChunkCoordinates()).a(Blocks.BUBBLE_COLUMN);
|
||||
}
|
||||
@@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
return this.isInWater() || this.isInRain() || this.k();
|
||||
}
|
||||
|
||||
+ public boolean isInWaterOrBubbleColumn() { return aD(); } // Paper - OBFHELPER
|
||||
+ public final boolean isInWaterOrBubbleColumn() { return aD(); } // Paper - OBFHELPER
|
||||
public boolean aD() {
|
||||
return this.isInWater() || this.k();
|
||||
}
|
||||
@@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
this.inLava = true;
|
||||
}
|
||||
|
||||
+ public boolean isInLava() { return aN(); } // Paper - OBFHELPER
|
||||
+ public final boolean isInLava() { return aN(); } // Paper - OBFHELPER
|
||||
public boolean aN() {
|
||||
return this.inLava;
|
||||
}
|
||||
|
Reference in New Issue
Block a user