core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall...

46 lines
2.0 KiB
Diff
Raw Normal View History

Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
From 1898a57c9e314e3f567a4cdd40013c8c842bec94 Mon Sep 17 00:00:00 2001
Toggleable Elytra Wall Damage Instead of calculating the damage taken from hitting a wall, you can disable it in the config.
2016-06-19 06:14:58 +00:00
From: Jadon Fowler <jadonflower@gmail.com>
Date: Sat, 18 Jun 2016 23:13:59 -0700
Subject: [PATCH] Toggleable Elytra Wall Damage
Instead of calculating the damage taken from hitting a wall, you can
disable it in the config.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
index 04861f146..dc96bd7f4 100644
Toggleable Elytra Wall Damage Instead of calculating the damage taken from hitting a wall, you can disable it in the config.
2016-06-19 06:14:58 +00:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
@@ -354,4 +354,9 @@ public class PaperWorldConfig {
Make alternative falling block ground detection configurable Workaround for GH-336
2016-07-29 01:54:48 +00:00
delayChunkUnloadsBy *= 1000;
}
Toggleable Elytra Wall Damage Instead of calculating the damage taken from hitting a wall, you can disable it in the config.
2016-06-19 06:14:58 +00:00
}
+
+ public boolean elytraHitWallDamage = true;
+ private void elytraHitWallDamage() {
+ elytraHitWallDamage = getBoolean("elytra-hit-wall-damage", true);
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
index ec901150d..b8ac99e5d 100644
Toggleable Elytra Wall Damage Instead of calculating the damage taken from hitting a wall, you can disable it in the config.
2016-06-19 06:14:58 +00:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
Fix build I totally didn't notice that the patch had a conflict >_>
2017-01-02 07:05:02 +00:00
@@ -1690,6 +1690,7 @@ public abstract class EntityLiving extends Entity {
Toggleable Elytra Wall Damage Instead of calculating the damage taken from hitting a wall, you can disable it in the config.
2016-06-19 06:14:58 +00:00
this.motY = 0.30000001192092896D;
}
Update Paper to MC 1.11
2016-11-17 02:23:38 +00:00
} else if (this.cH()) {
+ if (world.paperConfig.elytraHitWallDamage) { // Paper start - Toggleable Elytra Wall Damage
Toggleable Elytra Wall Damage Instead of calculating the damage taken from hitting a wall, you can disable it in the config.
2016-06-19 06:14:58 +00:00
if (this.motY > -0.5D) {
this.fallDistance = 1.0F;
}
Fix build I totally didn't notice that the patch had a conflict >_>
2017-01-02 07:05:02 +00:00
@@ -1739,6 +1740,7 @@ public abstract class EntityLiving extends Entity {
Toggleable Elytra Wall Damage Instead of calculating the damage taken from hitting a wall, you can disable it in the config.
2016-06-19 06:14:58 +00:00
this.damageEntity(DamageSource.FLY_INTO_WALL, f7);
}
}
+ } // Paper end - Elyta Wall Damage if statement
if (this.onGround && !this.world.isClientSide) {
if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
--
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 03:18:58 +00:00
2.12.0.windows.1
Toggleable Elytra Wall Damage Instead of calculating the damage taken from hitting a wall, you can disable it in the config.
2016-06-19 06:14:58 +00:00