mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 15:00:30 +01:00
Rename baby zombie movement config option
This option does not set the absolute speed of the entity as the name implies. It sets a modifier. The default (vanilla) value of `0.5` sets the baby zombie to move at 50% faster than the base speed. A negative value like `-0.4` would set them to move at 40% slower. There should be no functional changes as a result of this change, it's just clarifying the config name.
This commit is contained in:
parent
df984898ac
commit
0d3b35c339
60 changed files with 342 additions and 352 deletions
|
@ -1,4 +1,4 @@
|
|||
From 5e18e2daec98e2f74e083d7f2d9e3c0fee32f327 Mon Sep 17 00:00:00 2001
|
||||
From 70e801e21e09317358107fda0e7d5205c2654668 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Mon, 29 Feb 2016 21:02:09 -0600
|
||||
Subject: [PATCH] Paper config files
|
||||
|
@ -259,7 +259,7 @@ index 000000000..db899937b
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
new file mode 100644
|
||||
index 000000000..db79fe41b
|
||||
index 000000000..1c52aa6f7
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -0,0 +1,184 @@
|
||||
|
@ -324,8 +324,8 @@ index 000000000..db79fe41b
|
|||
+ commands = new HashMap<String, Command>();
|
||||
+ commands.put("paper", new PaperCommand("paper"));
|
||||
+
|
||||
+ version = getInt("config-version", 18);
|
||||
+ set("config-version", 18);
|
||||
+ version = getInt("config-version", 19);
|
||||
+ set("config-version", 19);
|
||||
+ readConfig(PaperConfig.class, null);
|
||||
+ }
|
||||
+
|
||||
|
@ -581,7 +581,7 @@ index e34ef4531..43d207ae5 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index bec64d7f2..7f648dbbc 100644
|
||||
index be1815d40..ce476a204 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -86,6 +86,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
||||
|
@ -666,7 +666,7 @@ index 305b6eaa9..dce5bde54 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index fd5bc0fec..0e33cb367 100644
|
||||
index e2aade101..5fe81e42a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -128,6 +128,14 @@ public class Main {
|
||||
|
@ -732,5 +732,5 @@ index 6ae3b3185..8c7dd0133 100644
|
|||
config.addDefault( "world-settings.default." + path, def );
|
||||
return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,26 +1,31 @@
|
|||
From 21e836a230f6b4ef85345c5faf0bd367259b1113 Mon Sep 17 00:00:00 2001
|
||||
From 3cd98352d4db9cbebceb1a2f4e4b6c68e5c519cc Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 13:09:16 -0600
|
||||
Subject: [PATCH] Configurable baby zombie movement speed
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 098bd3fba..55d8e74f8 100644
|
||||
index 098bd3fba..1aa046bfa 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -73,4 +73,10 @@ public class PaperWorldConfig {
|
||||
@@ -73,4 +73,15 @@ public class PaperWorldConfig {
|
||||
log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight);
|
||||
|
||||
}
|
||||
+
|
||||
+ public double babyZombieMovementSpeed;
|
||||
+ private void babyZombieMovementSpeed() {
|
||||
+ babyZombieMovementSpeed = getDouble("baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference
|
||||
+ log("Baby zombies will move at the speed of " + babyZombieMovementSpeed);
|
||||
+ public double babyZombieMovementModifier;
|
||||
+ private void babyZombieMovementModifier() {
|
||||
+ babyZombieMovementModifier = getDouble("baby-zombie-movement-modifier", 0.5D);
|
||||
+ if (PaperConfig.version < 19) {
|
||||
+ babyZombieMovementModifier = getDouble("baby-zombie-movement-speed", 0.5D);
|
||||
+ set("baby-zombie-movement-modifier", babyZombieMovementModifier);
|
||||
+ }
|
||||
+
|
||||
+ log("Baby zombies will move at the speed of " + babyZombieMovementModifier);
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
|
||||
index b8761e706..a3af14630 100644
|
||||
index b8761e706..4d4e8d022 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityZombie.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
|
||||
@@ -21,7 +21,7 @@ public class EntityZombie extends EntityMonster {
|
||||
|
@ -28,7 +33,7 @@ index b8761e706..a3af14630 100644
|
|||
protected static final IAttribute d = (new AttributeRanged((IAttribute) null, "zombie.spawnReinforcements", 0.0D, 0.0D, 1.0D)).a("Spawn Reinforcements Chance");
|
||||
private static final UUID b = UUID.fromString("B9766B59-9566-4402-BC1F-2EE2A276D836");
|
||||
- private static final AttributeModifier c = new AttributeModifier(EntityZombie.b, "Baby speed boost", 0.5D, AttributeModifier.Operation.MULTIPLY_BASE);
|
||||
+ private final AttributeModifier c = new AttributeModifier(EntityZombie.b, "Baby speed boost", world.paperConfig.babyZombieMovementSpeed, AttributeModifier.Operation.MULTIPLY_BASE); private final AttributeModifier babyModifier = this.c; // Paper - remove static - Make baby speed configurable
|
||||
+ private final AttributeModifier c = new AttributeModifier(EntityZombie.b, "Baby speed boost", world.paperConfig.babyZombieMovementModifier, AttributeModifier.Operation.MULTIPLY_BASE); private final AttributeModifier babyModifier = this.c; // Paper - remove static - Make baby speed configurable
|
||||
private static final DataWatcherObject<Boolean> bz = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
|
||||
private static final DataWatcherObject<Integer> bA = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.b);
|
||||
public static final DataWatcherObject<Boolean> DROWN_CONVERTING = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
|
||||
|
@ -45,5 +50,5 @@ index b8761e706..a3af14630 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
From 3fabcc0883b88ec4c3f2c19baf52314928c284be Mon Sep 17 00:00:00 2001
|
||||
From cef33b935109a611d30b424fbe87c5274f2a6773 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 13:14:11 -0600
|
||||
Subject: [PATCH] Configurable fishing time ranges
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 55d8e74f82..a55163a458 100644
|
||||
index 1aa046bfa..d9461dec6 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -79,4 +79,12 @@ public class PaperWorldConfig {
|
||||
babyZombieMovementSpeed = getDouble("baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference
|
||||
log("Baby zombies will move at the speed of " + babyZombieMovementSpeed);
|
||||
@@ -84,4 +84,12 @@ public class PaperWorldConfig {
|
||||
|
||||
log("Baby zombies will move at the speed of " + babyZombieMovementModifier);
|
||||
}
|
||||
+
|
||||
+ public int fishingMinTicks;
|
||||
|
@ -22,7 +22,7 @@ index 55d8e74f82..a55163a458 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
||||
index cdcad4c292..19a6233c3f 100644
|
||||
index cdcad4c29..19a6233c3 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
||||
@@ -329,8 +329,9 @@ public class EntityFishingHook extends Entity {
|
||||
|
@ -37,5 +37,5 @@ index cdcad4c292..19a6233c3f 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.21.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 5b97ebeb6ed39563881aebabe1c14a2061b568dc Mon Sep 17 00:00:00 2001
|
||||
From 13436ee21cb26e31559a4a9b75bd04e0c7a4751e Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 13:24:16 -0600
|
||||
Subject: [PATCH] Allow nerfed mobs to jump
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index a55163a458..341038fc4d 100644
|
||||
index d9461dec6..d0c23915d 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -87,4 +87,9 @@ public class PaperWorldConfig {
|
||||
@@ -92,4 +92,9 @@ public class PaperWorldConfig {
|
||||
fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600);
|
||||
log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ index a55163a458..341038fc4d 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java
|
||||
index 2e869004c8..8a6856e0fd 100644
|
||||
index 2e869004c..8a6856e0f 100644
|
||||
--- a/src/main/java/net/minecraft/server/ControllerJump.java
|
||||
+++ b/src/main/java/net/minecraft/server/ControllerJump.java
|
||||
@@ -13,6 +13,7 @@ public class ControllerJump {
|
||||
|
@ -31,7 +31,7 @@ index 2e869004c8..8a6856e0fd 100644
|
|||
this.b.setJumping(this.a);
|
||||
this.a = false;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index 6d7b313aeb..3a96f70d89 100644
|
||||
index f31a996aa..7c7d7a123 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@@ -32,6 +32,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
|
@ -56,7 +56,7 @@ index 6d7b313aeb..3a96f70d89 100644
|
|||
}
|
||||
// Spigot End
|
||||
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
|
||||
index 71b399c65c..2e23b5de59 100644
|
||||
index 71b399c65..2e23b5de5 100644
|
||||
--- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
|
||||
+++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
|
||||
@@ -8,10 +8,12 @@ public class PathfinderGoalFloat extends PathfinderGoal {
|
||||
|
@ -81,5 +81,5 @@ index 71b399c65c..2e23b5de59 100644
|
|||
public void e() {
|
||||
if (this.a.getRandom().nextFloat() < 0.8F) {
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 3518f124123b64cdd39895cc24b2abd9dfe98be3 Mon Sep 17 00:00:00 2001
|
||||
From 9e8ed2ed179e4a41806d9da9b8010ce293eef505 Mon Sep 17 00:00:00 2001
|
||||
From: Suddenly <suddenly@suddenly.coffee>
|
||||
Date: Tue, 1 Mar 2016 13:51:54 -0600
|
||||
Subject: [PATCH] Add configurable despawn distances for living entities
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 341038fc4d..3e1f4be10f 100644
|
||||
index d0c23915d..c1103bb8f 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -92,4 +92,20 @@ public class PaperWorldConfig {
|
||||
@@ -97,4 +97,20 @@ public class PaperWorldConfig {
|
||||
private void nerfedMobsShouldJump() {
|
||||
nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false);
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ index 341038fc4d..3e1f4be10f 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index 3a96f70d89..a2247fa1dd 100644
|
||||
index 7c7d7a123..14b4c1fe6 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@@ -613,11 +613,11 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
|
@ -48,5 +48,5 @@ index 3a96f70d89..a2247fa1dd 100644
|
|||
} else if (d0 < 1024.0D) {
|
||||
this.ticksFarFromPlayer = 0;
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From b8b74be9afd42aff05985ff3e7390e8e98f86651 Mon Sep 17 00:00:00 2001
|
||||
From 0feb10fd547e0c8bc4a33f5de32b39b1a032f528 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Thu, 3 Mar 2016 03:53:43 -0600
|
||||
Subject: [PATCH] Allow for toggling of spawn chunks
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 3e1f4be10f..3f734327c0 100644
|
||||
index c1103bb8f..625e75f93 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -108,4 +108,10 @@ public class PaperWorldConfig {
|
||||
@@ -113,4 +113,10 @@ public class PaperWorldConfig {
|
||||
softDespawnDistance = softDespawnDistance*softDespawnDistance;
|
||||
hardDespawnDistance = hardDespawnDistance*hardDespawnDistance;
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ index 3e1f4be10f..3f734327c0 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 2a0a7f2480..85056a7b1f 100644
|
||||
index 67cfcdd60..864d0dd00 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -152,6 +152,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
||||
|
@ -32,5 +32,5 @@ index 2a0a7f2480..85056a7b1f 100644
|
|||
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From ed171c8fbb759e34cb7970a7a668b9d032c0c853 Mon Sep 17 00:00:00 2001
|
||||
From 27fb70c36afb3d6838aaeb9d22dc04797b2ec7ef Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Tue, 1 Mar 2016 14:14:15 -0600
|
||||
Subject: [PATCH] Drop falling block and tnt entities at the specified height
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 3f734327c..1ed58f4bb 100644
|
||||
index 625e75f93..17ee44ae5 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -114,4 +114,14 @@ public class PaperWorldConfig {
|
||||
@@ -119,4 +119,14 @@ public class PaperWorldConfig {
|
||||
keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
|
||||
log("Keep spawn chunk loaded: " + keepSpawnInMemory);
|
||||
}
|
||||
|
@ -24,7 +24,7 @@ index 3f734327c..1ed58f4bb 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 43abdf41f..716892c72 100644
|
||||
index fd4712c71..40dcb3125 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1838,6 +1838,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
|
@ -36,7 +36,7 @@ index 43abdf41f..716892c72 100644
|
|||
public EntityItem a(ItemStack itemstack, float f) {
|
||||
if (itemstack.isEmpty()) {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||
index 7b7048090..7fb0c0e06 100644
|
||||
index dff903b6a..f8d8d8f35 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||
@@ -88,6 +88,16 @@ public class EntityFallingBlock extends Entity {
|
||||
|
@ -73,5 +73,5 @@ index 775192a59..e988abd67 100644
|
|||
if (this.onGround) {
|
||||
this.setMot(this.getMot().d(0.7D, -0.5D, 0.7D));
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From a0f544fdc476d10b40e8524b8ed958d13fa4fb1a Mon Sep 17 00:00:00 2001
|
||||
From a06c734c17e971836d677e5d7c45be34e36f20c4 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 23:58:50 -0600
|
||||
Subject: [PATCH] Configurable top of nether void damage
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 1ed58f4bb..a797a5767 100644
|
||||
index 17ee44ae5..4077f4c28 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -124,4 +124,19 @@ public class PaperWorldConfig {
|
||||
@@ -129,4 +129,19 @@ public class PaperWorldConfig {
|
||||
if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
|
||||
if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
|
||||
}
|
||||
|
@ -29,7 +29,7 @@ index 1ed58f4bb..a797a5767 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 8f97aa296..1af797b66 100644
|
||||
index 5f85eb2ba..9629489fa 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -398,9 +398,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
|
@ -95,5 +95,5 @@ index ff5d12817..e1a684b37 100644
|
|||
// this.doPortalTick(); // CraftBukkit - handled in postTick
|
||||
if (this.world.isClientSide) {
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 2babc5e8d9394f46ce6a5cbef320ed1b394d8ac2 Mon Sep 17 00:00:00 2001
|
||||
From 0f0308d28c55c73c25e8a82d198dc1ae26b86652 Mon Sep 17 00:00:00 2001
|
||||
From: DoctorDark <doctordark11@gmail.com>
|
||||
Date: Wed, 16 Mar 2016 02:21:39 -0500
|
||||
Subject: [PATCH] Configurable end credits
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index a797a5767..c2b9690a0 100644
|
||||
index 4077f4c28..29cd51f6b 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -139,4 +139,10 @@ public class PaperWorldConfig {
|
||||
@@ -144,4 +144,10 @@ public class PaperWorldConfig {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ index a797a5767..c2b9690a0 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index ed21ad635..41668d3db 100644
|
||||
index 94021e9b6..eecdade96 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
|
@ -41,5 +41,5 @@ index ed21ad635..41668d3db 100644
|
|||
this.cp = true;
|
||||
}
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From e19b758424d8aaf7798cc97d3f673ff9565313b3 Mon Sep 17 00:00:00 2001
|
||||
From c4a77f7b5d3d220be6ec5da3dce2caed19fd2c0d Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Wed, 2 Mar 2016 11:59:48 -0600
|
||||
Subject: [PATCH] Optimize explosions
|
||||
|
@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving
|
|||
an entity's exposure during an explosion.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index c2b9690a0c..a5ec0bc0e0 100644
|
||||
index 29cd51f6b..131b78dec 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -145,4 +145,10 @@ public class PaperWorldConfig {
|
||||
@@ -150,4 +150,10 @@ public class PaperWorldConfig {
|
||||
disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
|
||||
log("End credits disabled: " + disableEndCredits);
|
||||
}
|
||||
|
@ -25,7 +25,7 @@ index c2b9690a0c..a5ec0bc0e0 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
|
||||
index cdd8939504..bd6a0bd16b 100644
|
||||
index cdd893950..bd6a0bd16 100644
|
||||
--- a/src/main/java/net/minecraft/server/Explosion.java
|
||||
+++ b/src/main/java/net/minecraft/server/Explosion.java
|
||||
@@ -172,7 +172,7 @@ public class Explosion {
|
||||
|
@ -123,7 +123,7 @@ index cdd8939504..bd6a0bd16b 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 64c961e5b5..f56edde789 100644
|
||||
index 64c961e5b..f56edde78 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1162,6 +1162,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
|
@ -135,7 +135,7 @@ index 64c961e5b5..f56edde789 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 5fea828de0..ee869a769f 100644
|
||||
index 7a4c56353..3c3ba5df3 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -19,6 +19,7 @@ import org.apache.logging.log4j.util.Supplier;
|
||||
|
@ -155,5 +155,5 @@ index 5fea828de0..ee869a769f 100644
|
|||
public CraftWorld getWorld() {
|
||||
return this.world;
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 2e303afa46ba2d015c6ce0c2725ed1b3d603c0f4 Mon Sep 17 00:00:00 2001
|
||||
From a6a7e3593b128112343ff7c7b5970fe738ee0035 Mon Sep 17 00:00:00 2001
|
||||
From: Sudzzy <originmc@outlook.com>
|
||||
Date: Wed, 2 Mar 2016 14:48:03 -0600
|
||||
Subject: [PATCH] Disable explosion knockback
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index a5ec0bc0e0..6a307d5dd6 100644
|
||||
index 131b78dec..3fa78d286 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -151,4 +151,9 @@ public class PaperWorldConfig {
|
||||
@@ -156,4 +156,9 @@ public class PaperWorldConfig {
|
||||
optimizeExplosions = getBoolean("optimize-explosions", false);
|
||||
log("Optimize explosions: " + optimizeExplosions);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ index a5ec0bc0e0..6a307d5dd6 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 678dae6dae..061f708aea 100644
|
||||
index 47379046d..fd5d1e1c8 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -1118,6 +1118,7 @@ public abstract class EntityLiving extends Entity {
|
||||
|
@ -48,7 +48,7 @@ index 678dae6dae..061f708aea 100644
|
|||
if (!this.f(damagesource)) {
|
||||
SoundEffect soundeffect = this.getSoundDeath();
|
||||
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
|
||||
index bcff117619..6eeff4ce59 100644
|
||||
index bd6a0bd16..8cfdac036 100644
|
||||
--- a/src/main/java/net/minecraft/server/Explosion.java
|
||||
+++ b/src/main/java/net/minecraft/server/Explosion.java
|
||||
@@ -188,14 +188,14 @@ public class Explosion {
|
||||
|
@ -69,5 +69,5 @@ index bcff117619..6eeff4ce59 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From f4a563b9bb6fc4c886f4a499de3e11b0928e78d3 Mon Sep 17 00:00:00 2001
|
||||
From 5aae7de1321e74e61cb8d184344d1e7a3b373584 Mon Sep 17 00:00:00 2001
|
||||
From: Sudzzy <originmc@outlook.com>
|
||||
Date: Wed, 2 Mar 2016 14:52:43 -0600
|
||||
Subject: [PATCH] Disable thunder
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 6a307d5dd6..bf0cd6a8b4 100644
|
||||
index 3fa78d286..597a119db 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -156,4 +156,9 @@ public class PaperWorldConfig {
|
||||
@@ -161,4 +161,9 @@ public class PaperWorldConfig {
|
||||
private void disableExplosionKnockback(){
|
||||
disableExplosionKnockback = getBoolean("disable-explosion-knockback", false);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ index 6a307d5dd6..bf0cd6a8b4 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index c13f92011e..2d84c5e6f9 100644
|
||||
index c13f92011..2d84c5e6f 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -424,7 +424,7 @@ public class WorldServer extends World {
|
||||
|
@ -32,5 +32,5 @@ index c13f92011e..2d84c5e6f9 100644
|
|||
if (this.isRainingAt(blockposition)) {
|
||||
DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition);
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 10e783b966965f109ce7d8edf94c773a7fff2267 Mon Sep 17 00:00:00 2001
|
||||
From dc0333e3d9c9b29a3f9bf0a5a754288a1ddcd798 Mon Sep 17 00:00:00 2001
|
||||
From: Sudzzy <originmc@outlook.com>
|
||||
Date: Wed, 2 Mar 2016 14:57:24 -0600
|
||||
Subject: [PATCH] Disable ice and snow
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index bf0cd6a8b4..8db5c3f3fe 100644
|
||||
index 597a119db..77444bb90 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -161,4 +161,9 @@ public class PaperWorldConfig {
|
||||
@@ -166,4 +166,9 @@ public class PaperWorldConfig {
|
||||
private void disableThunder() {
|
||||
disableThunder = getBoolean("disable-thunder", false);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ index bf0cd6a8b4..8db5c3f3fe 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 2d84c5e6f9..9928e5aab7 100644
|
||||
index 2d84c5e6f..9928e5aab 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -444,7 +444,7 @@ public class WorldServer extends World {
|
||||
|
@ -32,5 +32,5 @@ index 2d84c5e6f9..9928e5aab7 100644
|
|||
BlockPosition blockposition1 = blockposition.down();
|
||||
BiomeBase biomebase = this.getBiome(blockposition);
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 95dbe985906096bdaf6410889068bbb80099cbf5 Mon Sep 17 00:00:00 2001
|
||||
From 83d1593f9fac787d5a019d02227c10630209f3d7 Mon Sep 17 00:00:00 2001
|
||||
From: Sudzzy <originmc@outlook.com>
|
||||
Date: Wed, 2 Mar 2016 15:03:53 -0600
|
||||
Subject: [PATCH] Configurable mob spawner tick rate
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 8db5c3f3fe..e4e00e2e1c 100644
|
||||
index 77444bb90..2e9bbc7e9 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -166,4 +166,9 @@ public class PaperWorldConfig {
|
||||
@@ -171,4 +171,9 @@ public class PaperWorldConfig {
|
||||
private void disableIceAndSnow(){
|
||||
disableIceAndSnow = getBoolean("disable-ice-and-snow", false);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ index 8db5c3f3fe..e4e00e2e1c 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
||||
index a2140cb6c5..b3af4ba233 100644
|
||||
index dc0e93926..13e62e3d7 100644
|
||||
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
||||
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
|
||||
@@ -23,6 +23,7 @@ public abstract class MobSpawnerAbstract {
|
||||
|
@ -64,5 +64,5 @@ index a2140cb6c5..b3af4ba233 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.21.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 91280bfceb4e92ed99055b27ca39f2493c82b7bd Mon Sep 17 00:00:00 2001
|
||||
From ae39546f7311f4271e399ee78803c75ea67c0f7e Mon Sep 17 00:00:00 2001
|
||||
From: Sudzzy <originmc@outlook.com>
|
||||
Date: Wed, 2 Mar 2016 23:34:44 -0600
|
||||
Subject: [PATCH] Configurable container update tick rate
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index e4e00e2e1c..d663b15ceb 100644
|
||||
index 2e9bbc7e9..6c775986d 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -171,4 +171,9 @@ public class PaperWorldConfig {
|
||||
@@ -176,4 +176,9 @@ public class PaperWorldConfig {
|
||||
private void mobSpawnerTickRate() {
|
||||
mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ index e4e00e2e1c..d663b15ceb 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index b907600db9..462c666735 100644
|
||||
index eecdade96..55e8174bf 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
|
@ -45,5 +45,5 @@ index b907600db9..462c666735 100644
|
|||
this.closeInventory();
|
||||
this.activeContainer = this.defaultContainer;
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From da9b5731ca8b9f6ba196fca9a1f072193204c395 Mon Sep 17 00:00:00 2001
|
||||
From cce60db4469922e6072042bec0b026f11476d8fa Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 3 Mar 2016 01:13:45 -0600
|
||||
Subject: [PATCH] Configurable Disabling Cat Chest Detection
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection
|
|||
Offers a gameplay feature to stop cats from blocking chests
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index d663b15ceb..2782970393 100644
|
||||
index 6c775986d..e80ffe34a 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -176,4 +176,9 @@ public class PaperWorldConfig {
|
||||
@@ -181,4 +181,9 @@ public class PaperWorldConfig {
|
||||
private void containerUpdateTickRate() {
|
||||
containerUpdateTickRate = getInt("container-update-tick-rate", 1);
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ index d663b15ceb..2782970393 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
|
||||
index 00b11a4b20..5fd6061f60 100644
|
||||
index 7bde15861..65b616481 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockChest.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockChest.java
|
||||
@@ -280,6 +280,11 @@ public class BlockChest extends BlockTileEntity implements IBlockWaterlogged {
|
||||
|
@ -36,5 +36,5 @@ index 00b11a4b20..5fd6061f60 100644
|
|||
|
||||
if (!list.isEmpty()) {
|
||||
--
|
||||
2.21.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 0cd703d13d59f0b5200d1aeb1fc39cafeb96f13e Mon Sep 17 00:00:00 2001
|
||||
From ad7bce2e1884350804f9b327ef455cae84ab4ade Mon Sep 17 00:00:00 2001
|
||||
From: vemacs <d@nkmem.es>
|
||||
Date: Thu, 3 Mar 2016 01:19:22 -0600
|
||||
Subject: [PATCH] All chunks are slime spawn chunks toggle
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 2782970393..be91b11242 100644
|
||||
index e80ffe34a..95245a981 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -181,4 +181,9 @@ public class PaperWorldConfig {
|
||||
@@ -186,4 +186,9 @@ public class PaperWorldConfig {
|
||||
private void disableChestCatDetection() {
|
||||
disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ index 2782970393..be91b11242 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
|
||||
index c3d4d00483..039050f634 100644
|
||||
index 87c37c0d6..a5238c673 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntitySlime.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
|
||||
@@ -274,7 +274,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
|
||||
|
@ -32,5 +32,5 @@ index c3d4d00483..039050f634 100644
|
|||
if (random.nextInt(10) == 0 && flag && blockposition.getY() < 40) {
|
||||
return a(entitytypes, generatoraccess, enummobspawn, blockposition, random);
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From a09b0acbefadc0c24ef240451bee1984098a61f9 Mon Sep 17 00:00:00 2001
|
||||
From 63dc2abcfda17e4a21a4c439763da839d46fbf5d Mon Sep 17 00:00:00 2001
|
||||
From: Joseph Hirschfeld <joe@ibj.io>
|
||||
Date: Thu, 3 Mar 2016 02:46:17 -0600
|
||||
Subject: [PATCH] Add configurable portal search radius
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index be91b11242..320fd07c62 100644
|
||||
index 95245a981..1d4ba4703 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -186,4 +186,9 @@ public class PaperWorldConfig {
|
||||
@@ -191,4 +191,9 @@ public class PaperWorldConfig {
|
||||
private void allChunksAreSlimeChunks() {
|
||||
allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ index be91b11242..320fd07c62 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
|
||||
index 6552f9e25e..2f0a8e4bb6 100644
|
||||
index 6552f9e25..2f0a8e4bb 100644
|
||||
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
|
||||
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
|
||||
@@ -70,10 +70,11 @@ public class PortalTravelAgent {
|
||||
|
@ -37,5 +37,5 @@ index 6552f9e25e..2f0a8e4bb6 100644
|
|||
blockposition2 = blockposition3.down();
|
||||
if (this.world.getType(blockposition3).getBlock() == PortalTravelAgent.b) {
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 6980d0f2a62012045490bdcba0fbbdd9d5e2978b Mon Sep 17 00:00:00 2001
|
||||
From c18e8929f1658981d8b517c7b3bf626db1b69654 Mon Sep 17 00:00:00 2001
|
||||
From: Sudzzy <originmc@outlook.com>
|
||||
Date: Thu, 3 Mar 2016 02:50:31 -0600
|
||||
Subject: [PATCH] Configurable inter-world teleportation safety
|
||||
|
@ -16,10 +16,10 @@ The wanted destination was on top of the emerald block however the player ended
|
|||
This only is the case if the player is teleporting between worlds.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 320fd07c62..94f5c90b3c 100644
|
||||
index 1d4ba4703..773fa8c32 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -191,4 +191,9 @@ public class PaperWorldConfig {
|
||||
@@ -196,4 +196,9 @@ public class PaperWorldConfig {
|
||||
private void portalSearchRadius() {
|
||||
portalSearchRadius = getInt("portal-search-radius", 128);
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ index 320fd07c62..94f5c90b3c 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 982b06b840..f4b3b7ff0b 100644
|
||||
index c50600b22..d247917f0 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -755,7 +755,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
@ -43,5 +43,5 @@ index 982b06b840..f4b3b7ff0b 100644
|
|||
return true;
|
||||
}
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 85c606fd896531c2bccb34cc7c8d54584a7a9083 Mon Sep 17 00:00:00 2001
|
||||
From f6a52c30101f704f878fd5c02dd3fc79ab00b389 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 8 Mar 2016 23:25:45 -0500
|
||||
Subject: [PATCH] Disable Scoreboards for non players by default
|
||||
|
@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team"
|
|||
logic which is most likely to be true.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 94f5c90b3..30f0dcfd5 100644
|
||||
index 773fa8c32..970de3fe8 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -196,4 +196,9 @@ public class PaperWorldConfig {
|
||||
@@ -201,4 +201,9 @@ public class PaperWorldConfig {
|
||||
private void disableTeleportationSuffocationCheck() {
|
||||
disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
|
||||
}
|
||||
|
@ -25,7 +25,7 @@ index 94f5c90b3..30f0dcfd5 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 1af797b66..09aaea7e8 100644
|
||||
index 9629489fa..a9271479b 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -2263,6 +2263,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
|
@ -37,7 +37,7 @@ index 1af797b66..09aaea7e8 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 6cb95a660..0b21c0b8d 100644
|
||||
index fd5d1e1c8..c335a20fa 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -582,6 +582,7 @@ public abstract class EntityLiving extends Entity {
|
||||
|
@ -49,5 +49,5 @@ index 6cb95a660..0b21c0b8d 100644
|
|||
|
||||
if (!flag) {
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 1124538dbf20a006fbefe28d8b32c01c922f1f0c Mon Sep 17 00:00:00 2001
|
||||
From 7478cfc72f66b5391dc408b2f71d8c53c5129ccc Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 18 Mar 2016 14:19:19 -0400
|
||||
Subject: [PATCH] Undead horse leashing
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Undead horse leashing
|
|||
default false to match vanilla, but option to allow undead horse types to be leashed.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 30f0dcfd51..89556dc94a 100644
|
||||
index 970de3fe8..aaa1b60f9 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -201,4 +201,9 @@ public class PaperWorldConfig {
|
||||
@@ -206,4 +206,9 @@ public class PaperWorldConfig {
|
||||
private void nonPlayerEntitiesOnScoreboards() {
|
||||
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ index 30f0dcfd51..89556dc94a 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
||||
index cb77d6bd21..b06bbc45cf 100644
|
||||
index 9c7e2437f..8aa60e95f 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
||||
@@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
|
||||
|
@ -33,5 +33,5 @@ index cb77d6bd21..b06bbc45cf 100644
|
|||
|
||||
@Override
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From a687e853d07ababb34e545ed49d5148d70209cbe Mon Sep 17 00:00:00 2001
|
||||
From bcd2fc4d37a9f78c89eeaaa4b79f6418579f4061 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 18 Mar 2016 15:12:22 -0400
|
||||
Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
|
|||
Can set a much shorter despawn rate for arrows that players can not pick up.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 89556dc94a..98049567f4 100644
|
||||
index aaa1b60f9..b72da38a7 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -206,4 +206,19 @@ public class PaperWorldConfig {
|
||||
@@ -211,4 +211,19 @@ public class PaperWorldConfig {
|
||||
private void allowLeashingUndeadHorse() {
|
||||
allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ index 89556dc94a..98049567f4 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
|
||||
index 2c0034cf76..44ea39e3d1 100644
|
||||
index e83b50ed4..2b829abac 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityArrow.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
|
||||
@@ -263,7 +263,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
|
||||
|
@ -43,5 +43,5 @@ index 2c0034cf76..44ea39e3d1 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 6be5c15bf9056637e470005f923c1a23563cb389 Mon Sep 17 00:00:00 2001
|
||||
From 74e0b9f473ac53d056cf7bfd6dd00bf3533d3149 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 22 Mar 2016 12:04:28 -0500
|
||||
Subject: [PATCH] Configurable spawn chances for skeleton horses
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 98049567f4..2a71381dae 100644
|
||||
index b72da38a7..b910b648f 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -221,4 +221,12 @@ public class PaperWorldConfig {
|
||||
@@ -226,4 +226,12 @@ public class PaperWorldConfig {
|
||||
log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate);
|
||||
log("Creative Arrow Despawn Rate: " + creativeArrowDespawnRate);
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ index 98049567f4..2a71381dae 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 9928e5aab7..d3039c2fd9 100644
|
||||
index 9928e5aab..d3039c2fd 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -428,7 +428,7 @@ public class WorldServer extends World {
|
||||
|
@ -35,5 +35,5 @@ index 9928e5aab7..d3039c2fd9 100644
|
|||
if (flag1) {
|
||||
EntityHorseSkeleton entityhorseskeleton = (EntityHorseSkeleton) EntityTypes.SKELETON_HORSE.a((World) this);
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 0610987b996606ad326ce15bff8d14a3db5d5457 Mon Sep 17 00:00:00 2001
|
||||
From 1717a3b6afb19fd2580234c2c1d5f0645740e96b Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 28 Mar 2016 20:46:14 -0400
|
||||
Subject: [PATCH] Configurable Chunk Inhabited Time
|
||||
|
@ -11,10 +11,10 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
|
|||
This allows to fine-tune vanilla gameplay.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 2a71381d..bcf4dc52 100644
|
||||
index b910b648f..4afd7553d 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -229,4 +229,14 @@ public class PaperWorldConfig {
|
||||
@@ -234,4 +234,14 @@ public class PaperWorldConfig {
|
||||
skeleHorseSpawnChance = 0.01D; // Vanilla value
|
||||
}
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ index 2a71381d..bcf4dc52 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index 591c823b..3d366dde 100644
|
||||
index 2dbfca3f0..85e17253d 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -839,7 +839,7 @@ public class Chunk implements IChunkAccess {
|
||||
|
@ -43,5 +43,5 @@ index 591c823b..3d366dde 100644
|
|||
|
||||
@Override
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 6678516453891bfdc84262f66cf700e7ac95474d Mon Sep 17 00:00:00 2001
|
||||
From b9d7b4651e3d7de16245a87466372c48aad93637 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 3 Apr 2016 16:28:17 -0400
|
||||
Subject: [PATCH] Configurable Grass Spread Tick Rate
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index bcf4dc52a..271410337 100644
|
||||
index 4afd7553d..88a4f8882 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -239,4 +239,10 @@ public class PaperWorldConfig {
|
||||
@@ -244,4 +244,10 @@ public class PaperWorldConfig {
|
||||
}
|
||||
fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1);
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ index bcf4dc52a..271410337 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
|
||||
index ddca19b46..377a57c89 100644
|
||||
index c4c9a353a..cb90b74ca 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
|
||||
@@ -29,6 +29,7 @@ public abstract class BlockDirtSnowSpreadable extends BlockDirtSnow {
|
||||
|
@ -32,5 +32,5 @@ index ddca19b46..377a57c89 100644
|
|||
if (!b(iblockdata, (IWorldReader) world, blockposition)) {
|
||||
// CraftBukkit start
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 8450187c9dae694288aa6eb2c64f2979755efeee Mon Sep 17 00:00:00 2001
|
||||
From 55a08558c4e2718bbf77f9ac687d962296d2dabc Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Wed, 6 Apr 2016 01:04:23 -0500
|
||||
Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
|
||||
|
@ -12,10 +12,10 @@ for this on CB at one point but I can't find it. We may need to do this
|
|||
ourselves at some point in the future.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 271410337d..aeeb7c24ef 100644
|
||||
index 88a4f8882..da2746754 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -245,4 +245,9 @@ public class PaperWorldConfig {
|
||||
@@ -250,4 +250,9 @@ public class PaperWorldConfig {
|
||||
grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate));
|
||||
log("Grass Spread Tick Rate: " + grassUpdateRate);
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ index 271410337d..aeeb7c24ef 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 32c6e2eca4..046bcb27e3 100644
|
||||
index 32c6e2eca..046bcb27e 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1631,7 +1631,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||
|
@ -48,7 +48,7 @@ index 32c6e2eca4..046bcb27e3 100644
|
|||
if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
|
||||
for (Object recipient : minecraftServer.getPlayerList().players) {
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index cce5305fbe..d368b39751 100644
|
||||
index cce5305fb..d368b3975 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -177,7 +177,7 @@ public abstract class PlayerList {
|
||||
|
@ -61,5 +61,5 @@ index cce5305fbe..d368b39751 100644
|
|||
playerconnection.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
|
||||
this.players.add(entityplayer);
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 7a007d2550ff79c4527828c92933958978c49ad5 Mon Sep 17 00:00:00 2001
|
||||
From f3379f11685779d6c619774596eeb258aea321fb Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Thu, 21 Apr 2016 23:51:55 -0700
|
||||
Subject: [PATCH] Add ability to configure frosted_ice properties
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index aeeb7c24e..409a84b52 100644
|
||||
index da2746754..bea878970 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -250,4 +250,14 @@ public class PaperWorldConfig {
|
||||
@@ -255,4 +255,14 @@ public class PaperWorldConfig {
|
||||
private void useVanillaScoreboardColoring() {
|
||||
useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
|
||||
}
|
||||
|
@ -54,5 +54,5 @@ index 1a0c2eeaa..39c3bbc9c 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From ec30f15d57b2f8c46583afcf3fcf75e9cd27638a Mon Sep 17 00:00:00 2001
|
||||
From 35f24483bdf3ab1260b36b66e51f4836bb0c33a0 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 1 May 2016 21:19:14 -0400
|
||||
Subject: [PATCH] LootTable API & Replenishable Lootables Feature
|
||||
|
@ -11,10 +11,10 @@ This feature is good for long term worlds so that newer players
|
|||
do not suffer with "Every chest has been looted"
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 409a84b52..134c4f7a3 100644
|
||||
index bea878970..934097163 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -260,4 +260,26 @@ public class PaperWorldConfig {
|
||||
@@ -265,4 +265,26 @@ public class PaperWorldConfig {
|
||||
this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
|
||||
log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
|
||||
}
|
||||
|
@ -520,7 +520,7 @@ index 000000000..d50410532
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 337b03a03..47446a74e 100644
|
||||
index 36bfee227..4793bc7d8 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
|
@ -532,7 +532,7 @@ index 337b03a03..47446a74e 100644
|
|||
|
||||
public CraftEntity getBukkitEntity() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
|
||||
index c223e1812..cf1c5d754 100644
|
||||
index 676d67dc3..8e6e7ed60 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
|
||||
@@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp
|
||||
|
@ -591,7 +591,7 @@ index c223e1812..cf1c5d754 100644
|
|||
|
||||
if (entityhuman != null) {
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
|
||||
index 39ebc7218..a346eba52 100644
|
||||
index 56c7f9b4e..a12d49fc4 100644
|
||||
--- a/src/main/java/net/minecraft/server/TileEntityLootable.java
|
||||
+++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
|
||||
@@ -6,8 +6,9 @@ import javax.annotation.Nullable;
|
||||
|
@ -756,5 +756,5 @@ index 334bd5bb3..f5b31237f 100644
|
|||
|
||||
public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From d437aee2a6ae591a9afe60a79cfd009b33765585 Mon Sep 17 00:00:00 2001
|
||||
From c6fac8147b0b1b3a1019625eb4e2ffaa05f22c3c Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Sun, 22 May 2016 20:20:55 -0500
|
||||
Subject: [PATCH] Optional TNT doesn't move in water
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 134c4f7a3..241149c9f 100644
|
||||
index 934097163..300cc68a7 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -2,7 +2,6 @@ package com.destroystokyo.paper;
|
||||
|
@ -16,7 +16,7 @@ index 134c4f7a3..241149c9f 100644
|
|||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.spigotmc.SpigotWorldConfig;
|
||||
|
||||
@@ -282,4 +281,14 @@ public class PaperWorldConfig {
|
||||
@@ -287,4 +286,14 @@ public class PaperWorldConfig {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -32,7 +32,7 @@ index 134c4f7a3..241149c9f 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 47446a74e..2a65a6685 100644
|
||||
index 4793bc7d8..0981e9c8c 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -2698,6 +2698,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
|
@ -107,5 +107,5 @@ index f04a9d18c..cd7e0299a 100644
|
|||
private java.util.Map<EntityPlayer, Boolean> trackedPlayerMap = null;
|
||||
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From ea60900a8d77be0c965014324fc93dc5657d4be1 Mon Sep 17 00:00:00 2001
|
||||
From 24ca14338a4d1ce533cc3d4d70841719e5e56200 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Wed, 5 Oct 2016 16:27:36 -0500
|
||||
Subject: [PATCH] Option to remove corrupt tile entities
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 241149c9f..849872f66 100644
|
||||
index 300cc68a7..83d430ee5 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -291,4 +291,9 @@ public class PaperWorldConfig {
|
||||
@@ -296,4 +296,9 @@ public class PaperWorldConfig {
|
||||
preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
|
||||
log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ index 241149c9f..849872f66 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index 3d366ddeb..cacef3ac9 100644
|
||||
index 85e17253d..1da80e244 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -533,6 +533,12 @@ public class Chunk implements IChunkAccess {
|
||||
|
@ -36,5 +36,5 @@ index 3d366ddeb..cacef3ac9 100644
|
|||
// CraftBukkit end
|
||||
}
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 8eaf282800c825f2c49bfe029e6ad4ba46c21e67 Mon Sep 17 00:00:00 2001
|
||||
From e385888483f36d5a346d3d59d1b3a89f532b042f Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Sat, 12 Nov 2016 23:25:22 -0600
|
||||
Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 849872f663..11b0f11a80 100644
|
||||
index 83d430ee5..5d7d6fa36 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -2,6 +2,7 @@ package com.destroystokyo.paper;
|
||||
|
@ -16,7 +16,7 @@ index 849872f663..11b0f11a80 100644
|
|||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.spigotmc.SpigotWorldConfig;
|
||||
|
||||
@@ -296,4 +297,12 @@ public class PaperWorldConfig {
|
||||
@@ -301,4 +302,12 @@ public class PaperWorldConfig {
|
||||
private void removeCorruptTEs() {
|
||||
removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ index 849872f663..11b0f11a80 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||
index 0f9fa41133..0a6d2b9b39 100644
|
||||
index 0f9fa4113..0a6d2b9b3 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||||
@@ -233,6 +233,15 @@ public class EntityFallingBlock extends Entity {
|
||||
|
@ -50,5 +50,5 @@ index 0f9fa41133..0a6d2b9b39 100644
|
|||
if (nbttagcompound.hasKeyOfType("HurtEntities", 99)) {
|
||||
this.hurtEntities = nbttagcompound.getBoolean("HurtEntities");
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f3fbc261cc75b70ebd3722190f12e04ef7ef0f75 Mon Sep 17 00:00:00 2001
|
||||
From 410b3f9d1345376d03424baec0e783aa30a41649 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 20 Dec 2016 15:26:27 -0500
|
||||
Subject: [PATCH] Configurable Cartographer Treasure Maps
|
||||
|
@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
|
|||
which are limited in quantity.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 11b0f11a8..46d525223 100644
|
||||
index 5d7d6fa36..0d2537ab8 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -305,4 +305,14 @@ public class PaperWorldConfig {
|
||||
@@ -310,4 +310,14 @@ public class PaperWorldConfig {
|
||||
Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 99aef69d63d3a44c6b7fcb9a5cbe573b0826402c Mon Sep 17 00:00:00 2001
|
||||
From e4d0e2c4c05de3b2d3f6554050f3e1cae9bce922 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 22 Jan 2017 18:07:56 -0500
|
||||
Subject: [PATCH] Cap Entity Collisions
|
||||
|
@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
|
|||
You can set this to 0 to disable collisions.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 46d5252239..de8362ddd7 100644
|
||||
index 0d2537ab8..2d01984f0 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -315,4 +315,10 @@ public class PaperWorldConfig {
|
||||
@@ -320,4 +320,10 @@ public class PaperWorldConfig {
|
||||
log("Treasure Maps will return already discovered locations");
|
||||
}
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ index 46d5252239..de8362ddd7 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index f4188fc75d..482864ac62 100644
|
||||
index f4188fc75..482864ac6 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
|
@ -39,7 +39,7 @@ index f4188fc75d..482864ac62 100644
|
|||
// Spigot end
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 6ba5e98400..79edb3b3cb 100644
|
||||
index 6ba5e9840..79edb3b3c 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -2560,8 +2560,11 @@ public abstract class EntityLiving extends Entity {
|
||||
|
@ -56,5 +56,5 @@ index 6ba5e98400..79edb3b3cb 100644
|
|||
this.D(entity);
|
||||
}
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 4b69c61b46470062ee37c9f54bc6ae98e6759489 Mon Sep 17 00:00:00 2001
|
||||
From 4e20ea037a039e8799ae11a8767bb7eb482b6865 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 16 May 2017 21:29:08 -0500
|
||||
Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
|
||||
|
@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
|
|||
To be converted into a Paper-API event at some point in the future?
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index de8362ddd7..54d6799442 100644
|
||||
index 2d01984f0..42c4a9445 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -321,4 +321,10 @@ public class PaperWorldConfig {
|
||||
@@ -326,4 +326,10 @@ public class PaperWorldConfig {
|
||||
maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
|
||||
log( "Max Entity Collisions: " + maxCollisionsPerEntity );
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ index de8362ddd7..54d6799442 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index 87d3337c88..1efec35941 100644
|
||||
index 4ceac0a2f..c162c6b73 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -451,7 +451,7 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
|
@ -39,7 +39,7 @@ index 87d3337c88..1efec35941 100644
|
|||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 068827e2ea..579c551f95 100644
|
||||
index 068827e2e..579c551f9 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1756,6 +1756,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||
|
@ -57,5 +57,5 @@ index 068827e2ea..579c551f95 100644
|
|||
case STOP_SNEAKING:
|
||||
this.player.setSneaking(false);
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From e8c7fda052854a3c98b1a29eff68f280e5e3e79e Mon Sep 17 00:00:00 2001
|
||||
From bf0e527e71fd52aa2bcc2fcd66a19a6fdbc90c5a Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
Date: Sun, 11 Jun 2017 21:01:18 +0100
|
||||
Subject: [PATCH] provide a configurable option to disable creeper lingering
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 54d6799442..4d0d4cbe4e 100644
|
||||
index 42c4a9445..891a52b2a 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -327,4 +327,10 @@ public class PaperWorldConfig {
|
||||
@@ -332,4 +332,10 @@ public class PaperWorldConfig {
|
||||
parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
|
||||
log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
|
||||
}
|
||||
|
@ -21,7 +21,7 @@ index 54d6799442..4d0d4cbe4e 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
|
||||
index 53b1e2ac03..100a1a10c9 100644
|
||||
index 53b1e2ac0..100a1a10c 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
|
||||
@@ -226,7 +226,7 @@ public class EntityCreeper extends EntityMonster {
|
||||
|
@ -34,5 +34,5 @@ index 53b1e2ac03..100a1a10c9 100644
|
|||
|
||||
entityareaeffectcloud.setSource(this); // CraftBukkit
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 7b7485a91475522cb0fe168bb65e6ec55c1caab6 Mon Sep 17 00:00:00 2001
|
||||
From 3885f25d48d36b79204cfdd48b64c40227a54199 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 10 Nov 2017 23:03:12 -0500
|
||||
Subject: [PATCH] Option for maximum exp value when merging orbs
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 4d0d4cbe4..b3d8fe9c6 100644
|
||||
index 891a52b2a..063ba6a1d 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -333,4 +333,10 @@ public class PaperWorldConfig {
|
||||
@@ -338,4 +338,10 @@ public class PaperWorldConfig {
|
||||
disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
|
||||
log("Creeper lingering effect: " + disableCreeperLingeringEffect);
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ index 4d0d4cbe4..b3d8fe9c6 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
index 0202c7662..5257941e9 100644
|
||||
index 7f38d82a6..a438e4320 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -537,16 +537,32 @@ public class CraftEventFactory {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 0057bdebdfd3f05456d733383f3ae0570885290b Mon Sep 17 00:00:00 2001
|
||||
From c8322dca6d932724fccf3fdff4d06653ae0bdcae Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Thu, 11 Jan 2018 16:47:28 -0600
|
||||
Subject: [PATCH] Make max squid spawn height configurable
|
||||
|
@ -7,10 +7,10 @@ I don't know why upstream made only the minimum height configurable but
|
|||
whatever
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index b3d8fe9c68..7287bf7d9b 100644
|
||||
index 063ba6a1d..aacce432b 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -339,4 +339,9 @@ public class PaperWorldConfig {
|
||||
@@ -344,4 +344,9 @@ public class PaperWorldConfig {
|
||||
expMergeMaxValue = getInt("experience-merge-max-value", -1);
|
||||
log("Experience Merge Max Value: " + expMergeMaxValue);
|
||||
}
|
||||
|
@ -21,7 +21,7 @@ index b3d8fe9c68..7287bf7d9b 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
|
||||
index f8fa64959f..735d1879a8 100644
|
||||
index f8fa64959..735d1879a 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntitySquid.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
|
||||
@@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal {
|
||||
|
@ -35,5 +35,5 @@ index f8fa64959f..735d1879a8 100644
|
|||
|
||||
public void a(float f, float f1, float f2) {
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From ad8729ec47c2d43f8740a8281437b0cee39798c2 Mon Sep 17 00:00:00 2001
|
||||
From eead92b8e3668ecf3902d8ee6a2cfb96b21f45cb Mon Sep 17 00:00:00 2001
|
||||
From: MiniDigger <admin@minidigger.me>
|
||||
Date: Sat, 10 Mar 2018 00:50:24 +0100
|
||||
Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 7287bf7d9..94ffba97b 100644
|
||||
index aacce432b..b87133fcf 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -182,6 +182,11 @@ public class PaperWorldConfig {
|
||||
@@ -187,6 +187,11 @@ public class PaperWorldConfig {
|
||||
disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@ index 7287bf7d9..94ffba97b 100644
|
|||
private void allChunksAreSlimeChunks() {
|
||||
allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index 50ded7483..0b27b7a27 100644
|
||||
index 90e5dd3e7..570974024 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -997,6 +997,7 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 075fd40696027b49c175eaadcfd3be4950de9d48 Mon Sep 17 00:00:00 2001
|
||||
From 9e61551040be429bd36b48e1b5f5f188903166c4 Mon Sep 17 00:00:00 2001
|
||||
From: Brokkonaut <hannos17@gmx.de>
|
||||
Date: Sat, 14 Apr 2018 20:20:46 +0200
|
||||
Subject: [PATCH] Configurable sprint interruption on attack
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable sprint interruption on attack
|
|||
If the sprint interruption is disabled players continue sprinting when they attack entities.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 94ffba97b..0b6e812d8 100644
|
||||
index b87133fcf..c57f7e7e8 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -349,4 +349,9 @@ public class PaperWorldConfig {
|
||||
@@ -354,4 +354,9 @@ public class PaperWorldConfig {
|
||||
private void squidMaxSpawnHeight() {
|
||||
squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ index 94ffba97b..0b6e812d8 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index 8b35443bd..dfd004f02 100644
|
||||
index 9df182def..ec99fb62b 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -1046,7 +1046,11 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f63e5fd2593cbe46eb018bcd6c08ca23a319310f Mon Sep 17 00:00:00 2001
|
||||
From 93ed3640c7b66d82bcdc6bec457caf6a5905af54 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 30 Apr 2018 17:15:26 -0400
|
||||
Subject: [PATCH] Block Enderpearl Travel Exploit
|
||||
|
@ -12,10 +12,10 @@ This disables that by not saving the thrower when the chunk is unloaded.
|
|||
This is mainly useful for survival servers that do not allow freeform teleporting.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 0b6e812d8d..da10550030 100644
|
||||
index c57f7e7e8..cb8922329 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -354,4 +354,10 @@ public class PaperWorldConfig {
|
||||
@@ -359,4 +359,10 @@ public class PaperWorldConfig {
|
||||
private void disableSprintInterruptionOnAttack() {
|
||||
disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ index 0b6e812d8d..da10550030 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
|
||||
index 5f0cb4c33d..f2f4b2d929 100644
|
||||
index 5f0cb4c33..f2f4b2d92 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityProjectile.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
|
||||
@@ -205,6 +205,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
|
||||
|
@ -39,5 +39,5 @@ index 5f0cb4c33d..f2f4b2d929 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 4cf5578f687a0d20448b35a1e2935c1dc6dabefd Mon Sep 17 00:00:00 2001
|
||||
From 583de78b3b0a8015292a358277c9a45eb458177c Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 16 Jun 2018 01:18:16 -0500
|
||||
Subject: [PATCH] Make shield blocking delay configurable
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index da1055003..182ac2e7f 100644
|
||||
index cb8922329..6c3d074b8 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -360,4 +360,9 @@ public class PaperWorldConfig {
|
||||
@@ -365,4 +365,9 @@ public class PaperWorldConfig {
|
||||
disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
|
||||
log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
|
||||
}
|
||||
|
@ -68,5 +68,5 @@ index b8482c632..67f275321 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 7320ef367e08783793e1b1a464626ecdeb810259 Mon Sep 17 00:00:00 2001
|
||||
From 24d1262ccbd9493d25537b1dd8f780752b8e5ef5 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 22 Jun 2018 10:38:31 -0500
|
||||
Subject: [PATCH] Add config to disable ender dragon legacy check
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 182ac2e7f6..b7e819d601 100644
|
||||
index 6c3d074b8..bf08deb25 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -365,4 +365,9 @@ public class PaperWorldConfig {
|
||||
@@ -370,4 +370,9 @@ public class PaperWorldConfig {
|
||||
private void shieldBlockingDelay() {
|
||||
shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ index 182ac2e7f6..b7e819d601 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
|
||||
index 88a8e4abd0..6700c8c658 100644
|
||||
index 88a8e4abd..6700c8c65 100644
|
||||
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
|
||||
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
|
||||
@@ -28,10 +28,10 @@ public class EnderDragonBattle {
|
||||
|
@ -47,5 +47,5 @@ index 88a8e4abd0..6700c8c658 100644
|
|||
if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
|
||||
if (nbttagcompound.b("DragonUUID")) {
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 4cd00bd2211d90c38f4604afcd55457d3ded9461 Mon Sep 17 00:00:00 2001
|
||||
From b82b0677d8284ed9c9a6821b37d695cf40b1d33f Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 4 Jul 2018 15:22:06 -0400
|
||||
Subject: [PATCH] Configurable Bed Search Radius
|
||||
|
@ -10,10 +10,10 @@ player at their bed should it of became obstructed.
|
|||
Defaults to vanilla 1.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index b7e819d601..fc0455934b 100644
|
||||
index bf08deb25..1ffcebd3c 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -370,4 +370,15 @@ public class PaperWorldConfig {
|
||||
@@ -375,4 +375,15 @@ public class PaperWorldConfig {
|
||||
private void scanForLegacyEnderDragon() {
|
||||
scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ index b7e819d601..fc0455934b 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
|
||||
index 43b5d00b02..b2525e2a2d 100644
|
||||
index 43b5d00b0..b2525e2a2 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockBed.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockBed.java
|
||||
@@ -171,6 +171,10 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
|
||||
|
@ -149,5 +149,5 @@ index 43b5d00b02..b2525e2a2d 100644
|
|||
VoxelShape voxelshape = iworldreader.getType(blockposition).getCollisionShape(iworldreader, blockposition);
|
||||
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 57d2c6e11b7ac54355e761d06b3ace6f2b1b7df6 Mon Sep 17 00:00:00 2001
|
||||
From 0b4c26afdef9e3616c02b0d712527b266630fd31 Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Manrique <hugmanrique@gmail.com>
|
||||
Date: Mon, 23 Jul 2018 12:57:39 +0200
|
||||
Subject: [PATCH] Option to prevent armor stands from doing entity lookups
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index fc0455934b..09607fb447 100644
|
||||
index 1ffcebd3c..721685704 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -321,6 +321,11 @@ public class PaperWorldConfig {
|
||||
@@ -326,6 +326,11 @@ public class PaperWorldConfig {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@ index fc0455934b..09607fb447 100644
|
|||
private void maxEntityCollision() {
|
||||
maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 627fec10a8..cacc18ca41 100644
|
||||
index 95c809ba9..98195fb16 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -868,6 +868,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
||||
|
@ -40,5 +40,5 @@ index 627fec10a8..cacc18ca41 100644
|
|||
int i = MathHelper.floor(axisalignedbb.minX);
|
||||
int j = MathHelper.f(axisalignedbb.maxX);
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 90e7aab7fb05f9d57e27ba10668f10d43c9d47ad Mon Sep 17 00:00:00 2001
|
||||
From 2a3338308eecbeca3e916817a22e9abb19452f88 Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Wed, 15 Aug 2018 01:26:09 -0700
|
||||
Subject: [PATCH] Allow disabling armour stand ticking
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 09607fb44..5832c3e86 100644
|
||||
index 721685704..9ee27f638 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -386,4 +386,10 @@ public class PaperWorldConfig {
|
||||
@@ -391,4 +391,10 @@ public class PaperWorldConfig {
|
||||
log("Bed Search Radius: " + bedSearchRadius);
|
||||
}
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ index 09607fb44..5832c3e86 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
index c04dee058..529e4904e 100644
|
||||
index d8497fa5e..85fc48371 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
||||
@@ -44,6 +44,12 @@ public class EntityArmorStand extends EntityLiving {
|
||||
|
@ -279,5 +279,5 @@ index 9f5c3b92e..73714d71a 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 940cf3172b52e2988e9f34921ce7cca05de151aa Mon Sep 17 00:00:00 2001
|
||||
From aedcb2249752ae04d77f953d837e2af692ef756f Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 27 Apr 2016 22:09:52 -0400
|
||||
Subject: [PATCH] Optimize Hoppers
|
||||
|
@ -11,10 +11,10 @@ Subject: [PATCH] Optimize Hoppers
|
|||
* Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 5832c3e868..ede558d029 100644
|
||||
index 9ee27f638..269c1ace4 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -355,6 +355,15 @@ public class PaperWorldConfig {
|
||||
@@ -360,6 +360,15 @@ public class PaperWorldConfig {
|
||||
squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 0.0D);
|
||||
}
|
||||
|
||||
|
@ -31,7 +31,7 @@ index 5832c3e868..ede558d029 100644
|
|||
private void disableSprintInterruptionOnAttack() {
|
||||
disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
index c69a067ef1..1e23d77e72 100644
|
||||
index c69a067ef..1e23d77e7 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
@@ -482,8 +482,9 @@ public final class ItemStack {
|
||||
|
@ -47,7 +47,7 @@ index c69a067ef1..1e23d77e72 100644
|
|||
itemstack.d(this.C());
|
||||
if (this.tag != null) {
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 6f410ca921..c075780674 100644
|
||||
index 6f410ca92..c07578067 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1160,6 +1160,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
|
@ -59,7 +59,7 @@ index 6f410ca921..c075780674 100644
|
|||
this.methodProfiler.a(() -> {
|
||||
return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager());
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
||||
index c72b013868..b8ddb99fa3 100644
|
||||
index c72b01386..b8ddb99fa 100644
|
||||
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
||||
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
||||
@@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
|
||||
|
@ -79,7 +79,7 @@ index c72b013868..b8ddb99fa3 100644
|
|||
this.world.b(this.position, this);
|
||||
if (!this.c.isAir()) {
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
||||
index 1ba98bf736..6f6519f6c5 100644
|
||||
index 1ba98bf73..6f6519f6c 100644
|
||||
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
|
||||
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
||||
@@ -189,6 +189,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
|
||||
|
@ -299,5 +299,5 @@ index 1ba98bf736..6f6519f6c5 100644
|
|||
flag = true;
|
||||
} else if (a(itemstack1, itemstack)) {
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From a046292b3b54be6e6a242b791fa08039e4c3f4e0 Mon Sep 17 00:00:00 2001
|
||||
From d9f6102addc1d6c4361c79f61a40d7edba63ce4b Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Wed, 8 Aug 2018 16:33:21 -0600
|
||||
Subject: [PATCH] Configurable speed for water flowing over lava
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index ede558d029..7e031d18e0 100644
|
||||
index 269c1ace4..4a4e9d715 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -396,6 +396,12 @@ public class PaperWorldConfig {
|
||||
@@ -401,6 +401,12 @@ public class PaperWorldConfig {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@ index ede558d029..7e031d18e0 100644
|
|||
private void armorStandTick() {
|
||||
this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
|
||||
index cccdd13988..56bf0b1d81 100644
|
||||
index cccdd1398..56bf0b1d8 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockFluids.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockFluids.java
|
||||
@@ -70,11 +70,27 @@ public class BlockFluids extends Block implements IFluidSource {
|
||||
|
@ -64,5 +64,5 @@ index cccdd13988..56bf0b1d81 100644
|
|||
|
||||
}
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 290df5e30a0c066bc69fabaa9b202e1ab2352b4a Mon Sep 17 00:00:00 2001
|
||||
From 14201322b20e2e04e8cd67161dae08b5527b4606 Mon Sep 17 00:00:00 2001
|
||||
From: Trigary <trigary0@gmail.com>
|
||||
Date: Fri, 14 Sep 2018 17:42:08 +0200
|
||||
Subject: [PATCH] Limit lightning strike effect distance
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 7e031d18e0..63f313a92d 100644
|
||||
index 4a4e9d715..3b24fbdbf 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -234,6 +234,28 @@ public class PaperWorldConfig {
|
||||
@@ -239,6 +239,28 @@ public class PaperWorldConfig {
|
||||
skeleHorseSpawnChance = 0.01D; // Vanilla value
|
||||
}
|
||||
}
|
||||
|
@ -38,7 +38,7 @@ index 7e031d18e0..63f313a92d 100644
|
|||
public int fixedInhabitedTime;
|
||||
private void fixedInhabitedTime() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
|
||||
index 2ceee79cf2..27bf271bb5 100644
|
||||
index 2ceee79cf..27bf271bb 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLightning.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLightning.java
|
||||
@@ -64,6 +64,17 @@ public class EntityLightning extends Entity {
|
||||
|
@ -69,7 +69,7 @@ index 2ceee79cf2..27bf271bb5 100644
|
|||
|
||||
--this.lifeTicks;
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 8b55879c64..dbd357f1a3 100644
|
||||
index 8b55879c6..dbd357f1a 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -1251,7 +1251,7 @@ public class WorldServer extends World {
|
||||
|
@ -82,5 +82,5 @@ index 8b55879c64..dbd357f1a3 100644
|
|||
|
||||
@Override
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From e48549fad9ec1b3e24e92b4ffc9f434552828f90 Mon Sep 17 00:00:00 2001
|
||||
From a07c0dd20ed878f0b680301efe4a1389be54f8af Mon Sep 17 00:00:00 2001
|
||||
From: Gabriele C <sgdc3.mail@gmail.com>
|
||||
Date: Mon, 22 Oct 2018 17:34:10 +0200
|
||||
Subject: [PATCH] Add option to prevent players from moving into unloaded
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 63f313a92..2299860b8 100644
|
||||
index 3b24fbdbf..c7ff264cb 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -429,4 +429,9 @@ public class PaperWorldConfig {
|
||||
@@ -434,4 +434,9 @@ public class PaperWorldConfig {
|
||||
this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
|
||||
log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
|
||||
}
|
||||
|
@ -63,5 +63,5 @@ index a814d8cae..b0fd4d800 100644
|
|||
if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean(GameRules.DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isGliding())) {
|
||||
float f2 = this.player.isGliding() ? 300.0F : 100.0F;
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 62b4b8f39aa3507325cb971c593ca157a7b1f116 Mon Sep 17 00:00:00 2001
|
||||
From 0834959b160570b5a53a63d118ae4c460e857aed Mon Sep 17 00:00:00 2001
|
||||
From: theosib <millerti@172.16.221.1>
|
||||
Date: Thu, 27 Sep 2018 01:43:35 -0600
|
||||
Subject: [PATCH] Optimize redstone algorithm
|
||||
|
@ -19,10 +19,10 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
|
|||
Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 2299860b81..91c809b7ce 100644
|
||||
index c7ff264cb..1ad6d6483 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -434,4 +434,14 @@ public class PaperWorldConfig {
|
||||
@@ -439,4 +439,14 @@ public class PaperWorldConfig {
|
||||
private void preventMovingIntoUnloadedChunks() {
|
||||
preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
|
||||
}
|
||||
|
@ -39,7 +39,7 @@ index 2299860b81..91c809b7ce 100644
|
|||
}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
|
||||
new file mode 100644
|
||||
index 0000000000..cf5661f1c5
|
||||
index 000000000..cf5661f1c
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
|
||||
@@ -0,0 +1,912 @@
|
||||
|
@ -956,7 +956,7 @@ index 0000000000..cf5661f1c5
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
|
||||
index cffb8de4f1..337c03d1d8 100644
|
||||
index cffb8de4f..337c03d1d 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
|
||||
@@ -1,5 +1,7 @@
|
||||
|
@ -1124,7 +1124,7 @@ index cffb8de4f1..337c03d1d8 100644
|
|||
c(iblockdata, world, blockposition);
|
||||
world.a(blockposition, false);
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 1c3285f5c0..ef561cd95b 100644
|
||||
index dc0d89ee6..6189935bd 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -594,6 +594,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
||||
|
@ -1144,5 +1144,5 @@ index 1c3285f5c0..ef561cd95b 100644
|
|||
int i = 0;
|
||||
EnumDirection[] aenumdirection = World.a;
|
||||
--
|
||||
2.22.0
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From eb815c41725bd643d265dc37cece57e817062735 Mon Sep 17 00:00:00 2001
|
||||
From 18d82f31c755d23c045283654eb024db32a8eeff Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 21 Jul 2018 14:27:34 -0400
|
||||
Subject: [PATCH] Duplicate UUID Resolve Option
|
||||
|
@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
|
|||
It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 91c809b7ce..d8bb13693d 100644
|
||||
index 1ad6d6483..acc84eec1 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -444,4 +444,43 @@ public class PaperWorldConfig {
|
||||
@@ -449,4 +449,43 @@ public class PaperWorldConfig {
|
||||
log("Using vanilla redstone algorithm.");
|
||||
}
|
||||
}
|
||||
|
@ -81,7 +81,7 @@ index 91c809b7ce..d8bb13693d 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index 09e010e670..ee8f801745 100644
|
||||
index 09e010e67..ee8f80174 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -397,6 +397,7 @@ public class Chunk implements IChunkAccess {
|
||||
|
@ -93,7 +93,7 @@ index 09e010e670..ee8f801745 100644
|
|||
|
||||
int k = MathHelper.floor(entity.locY / 16.0D);
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index f87514a200..55c73ffcaa 100644
|
||||
index f87514a20..55c73ffca 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -2728,6 +2728,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
|
@ -105,7 +105,7 @@ index f87514a200..55c73ffcaa 100644
|
|||
this.uniqueID = uuid;
|
||||
this.ap = this.uniqueID.toString();
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
index 6379d2d84f..67d011745f 100644
|
||||
index 6379d2d84..67d011745 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
@@ -1,6 +1,7 @@
|
||||
|
@ -196,7 +196,7 @@ index 6379d2d84f..67d011745f 100644
|
|||
|
||||
if (list != null) {
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index cc2c139904..29bb795f73 100644
|
||||
index cc2c13990..29bb795f7 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -2,6 +2,8 @@ package net.minecraft.server;
|
||||
|
@ -244,5 +244,5 @@ index cc2c139904..29bb795f73 100644
|
|||
logger.error("Overwrote an existing entity " + old + " with " + entity);
|
||||
if (DEBUG_ENTITIES) {
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From a2f4e3de9bff7e6420d243a41c2ae929178636f3 Mon Sep 17 00:00:00 2001
|
||||
From 56cea870900e4546d9979bc37bf98f70f31af32f Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 13 Sep 2014 23:14:43 -0400
|
||||
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
|
|||
This lets you disable it for some worlds and lower it for others.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index d8bb13693d..de11a91af6 100644
|
||||
index acc84eec1..9ff115294 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -483,4 +483,10 @@ public class PaperWorldConfig {
|
||||
@@ -488,4 +488,10 @@ public class PaperWorldConfig {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -21,7 +21,7 @@ index d8bb13693d..de11a91af6 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index ee02001700..a6f112bd0f 100644
|
||||
index ee0200170..a6f112bd0 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -577,6 +577,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
|
@ -72,7 +72,7 @@ index ee02001700..a6f112bd0f 100644
|
|||
// CraftBukkit start
|
||||
// this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldLoadListener.java b/src/main/java/net/minecraft/server/WorldLoadListener.java
|
||||
index d6762d3853..7b6f5b2da0 100644
|
||||
index d6762d385..7b6f5b2da 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldLoadListener.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldLoadListener.java
|
||||
@@ -9,4 +9,6 @@ public interface WorldLoadListener {
|
||||
|
@ -83,7 +83,7 @@ index d6762d3853..7b6f5b2da0 100644
|
|||
+ void setChunkRadius(int radius); // Paper - allow changing chunk radius
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
|
||||
index 3868572aed..ae77805f71 100644
|
||||
index 3868572ae..ae77805f7 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldLoadListenerLogger.java
|
||||
@@ -7,16 +7,24 @@ import org.apache.logging.log4j.Logger;
|
||||
|
@ -114,7 +114,7 @@ index 3868572aed..ae77805f71 100644
|
|||
@Override
|
||||
public void a(ChunkCoordIntPair chunkcoordintpair) {
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 29bb795f73..3acea575d0 100644
|
||||
index 29bb795f7..3acea575d 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -1559,13 +1559,85 @@ public class WorldServer extends World {
|
||||
|
@ -207,7 +207,7 @@ index 29bb795f73..3acea575d0 100644
|
|||
|
||||
public LongSet getForceLoadedChunks() {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index f2a68ec360..e42bd26380 100644
|
||||
index f2a68ec36..e42bd2638 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -1872,15 +1872,21 @@ public class CraftWorld implements World {
|
||||
|
@ -237,5 +237,5 @@ index f2a68ec360..e42bd26380 100644
|
|||
|
||||
@Override
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 129f226208f6d4a3ec6cc7ad2e07ae3614794467 Mon Sep 17 00:00:00 2001
|
||||
From 789d6e1227d70f686850dd8e954de4106a9cc709 Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
Date: Sun, 9 Jun 2019 03:53:22 +0100
|
||||
Subject: [PATCH] incremental chunk saving
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index de11a91af6..4d3c6c6b47 100644
|
||||
index 9ff115294..e98b1f243 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -489,4 +489,19 @@ public class PaperWorldConfig {
|
||||
@@ -494,4 +494,19 @@ public class PaperWorldConfig {
|
||||
keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
|
||||
log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
|
||||
}
|
||||
|
@ -29,7 +29,7 @@ index de11a91af6..4d3c6c6b47 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index ee8f801745..2003522d96 100644
|
||||
index ee8f80174..2003522d9 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -42,7 +42,7 @@ public class Chunk implements IChunkAccess {
|
||||
|
@ -42,7 +42,7 @@ index ee8f801745..2003522d96 100644
|
|||
private long t;
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 02dfd91c5e..8689e0f9f0 100644
|
||||
index 02dfd91c5..8689e0f9f 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -335,6 +335,15 @@ public class ChunkProviderServer extends IChunkProvider {
|
||||
|
@ -62,7 +62,7 @@ index 02dfd91c5e..8689e0f9f0 100644
|
|||
public void close() throws IOException {
|
||||
// CraftBukkit start
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index a6f112bd0f..5238a1a7ca 100644
|
||||
index a6f112bd0..5238a1a7c 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -165,6 +165,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
|
@ -108,7 +108,7 @@ index a6f112bd0f..5238a1a7ca 100644
|
|||
this.methodProfiler.enter("snooper");
|
||||
if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && !this.snooper.d() && this.ticks > 100) { // Spigot
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
index 493770bf68..2be6fa0f07 100644
|
||||
index 493770bf6..2be6fa0f0 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
@@ -297,6 +297,36 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
||||
|
@ -149,7 +149,7 @@ index 493770bf68..2be6fa0f07 100644
|
|||
if (flag) {
|
||||
List<PlayerChunk> list = (List) this.visibleChunks.values().stream().filter(PlayerChunk::hasBeenLoaded).peek(PlayerChunk::m).collect(Collectors.toList());
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 3acea575d0..7c5349b172 100644
|
||||
index 3acea575d..7c5349b17 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -791,11 +791,44 @@ public class WorldServer extends World {
|
||||
|
@ -199,5 +199,5 @@ index 3acea575d0..7c5349b172 100644
|
|||
if (iprogressupdate != null) {
|
||||
iprogressupdate.a(new ChatMessage("menu.savingLevel", new Object[0]));
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,26 +1,11 @@
|
|||
From 85ac131a4f40d3ec4f7ead19f679a5305c176712 Mon Sep 17 00:00:00 2001
|
||||
From b06153f5f4cf93ac437d8bcf90ff306d2e56dbe1 Mon Sep 17 00:00:00 2001
|
||||
From: stonar96 <minecraft.stonar96@gmail.com>
|
||||
Date: Mon, 20 Aug 2018 03:03:58 +0200
|
||||
Subject: [PATCH] Anti-Xray
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 81987e4ad..5942c3438 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -71,8 +71,8 @@ public class PaperConfig {
|
||||
commands = new HashMap<String, Command>();
|
||||
commands.put("paper", new PaperCommand("paper"));
|
||||
|
||||
- version = getInt("config-version", 18);
|
||||
- set("config-version", 18);
|
||||
+ version = getInt("config-version", 19);
|
||||
+ set("config-version", 19);
|
||||
readConfig(PaperConfig.class, null);
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 4d3c6c6b4..929f5c303 100644
|
||||
index e98b1f243..e9d1b47ad 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -1,7 +1,11 @@
|
||||
|
@ -35,7 +20,7 @@ index 4d3c6c6b4..929f5c303 100644
|
|||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.spigotmc.SpigotWorldConfig;
|
||||
@@ -504,4 +508,43 @@ public class PaperWorldConfig {
|
||||
@@ -509,4 +513,43 @@ public class PaperWorldConfig {
|
||||
private void maxAutoSaveChunksPerTick() {
|
||||
maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
|
||||
}
|
||||
|
@ -1595,7 +1580,7 @@ index fbbd4d5dd..fd0d2b6e6 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
||||
index 1c79890e3..e5e9de542 100644
|
||||
index a36aba015..f04fc366f 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
||||
@@ -253,6 +253,8 @@ public class PlayerInteractManager {
|
||||
|
@ -1663,7 +1648,7 @@ index 157ca6a7e..9c114d2d3 100644
|
|||
public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
|
||||
return new TicketType<>(s, comparator, 0L);
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 10c149fae..ab98c7b79 100644
|
||||
index 3f71ca9e4..e31ffdb0d 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -2,6 +2,8 @@ package net.minecraft.server;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 7b2b782e1ca503f84d3fbc1df497fcaa2381f7b3 Mon Sep 17 00:00:00 2001
|
||||
From 7dff966d78ac7e89c7b4ecfe65bdfc6fca5e4584 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 24 Mar 2019 01:01:32 -0400
|
||||
Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob
|
||||
|
@ -17,10 +17,10 @@ This should fully solve all of the issues around it so that only natural
|
|||
influences natural spawns.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 929f5c3031..ff520d9e86 100644
|
||||
index e9d1b47ad..59671c5c3 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -509,6 +509,16 @@ public class PaperWorldConfig {
|
||||
@@ -514,6 +514,16 @@ public class PaperWorldConfig {
|
||||
maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
|
||||
}
|
||||
|
||||
|
@ -38,7 +38,7 @@ index 929f5c3031..ff520d9e86 100644
|
|||
public boolean asynchronous;
|
||||
public EngineMode engineMode;
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 7c5349b172..0761f705be 100644
|
||||
index 7c5349b17..0761f705b 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -934,6 +934,13 @@ public class WorldServer extends World {
|
||||
|
@ -56,5 +56,5 @@ index 7c5349b172..0761f705be 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 8a39edd47a4135f609b6b90b41689cf6331961ea Mon Sep 17 00:00:00 2001
|
||||
From 6343919aa4c2103ca7f080a2c485ad1fcb300119 Mon Sep 17 00:00:00 2001
|
||||
From: Lucavon <lucavonlp@gmail.com>
|
||||
Date: Tue, 23 Jul 2019 20:29:20 -0500
|
||||
Subject: [PATCH] Configurable projectile relative velocity
|
||||
|
@ -25,10 +25,10 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
|
|||
server-internal fix makes this change future-proof.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index ff520d9e8..318a470ee 100644
|
||||
index 59671c5c3..56ca65819 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -557,4 +557,9 @@ public class PaperWorldConfig {
|
||||
@@ -562,4 +562,9 @@ public class PaperWorldConfig {
|
||||
}
|
||||
log("Anti-Xray: " + (antiXray ? "enabled" : "disabled") + " / Engine Mode: " + engineMode.getDescription() + " / Chunk Edge Mode: " + chunkEdgeMode.getDescription() + " / Up to " + ((maxChunkSectionIndex + 1) * 16) + " blocks / Update Radius: " + updateRadius);
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From c34bcad7cc5485514787db9c141cc08843033381 Mon Sep 17 00:00:00 2001
|
||||
From ded4f6aae9c22c6a493c2eb1074a86d26f017cd0 Mon Sep 17 00:00:00 2001
|
||||
From: kickash32 <kickash32@gmail.com>
|
||||
Date: Mon, 3 Jun 2019 02:02:39 -0400
|
||||
Subject: [PATCH] Implement alternative item-despawn-rate
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 318a470ee..e7bbeef74 100644
|
||||
index 56ca65819..b1ad22c9f 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -1,12 +1,17 @@
|
||||
|
@ -26,7 +26,7 @@ index 318a470ee..e7bbeef74 100644
|
|||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.spigotmc.SpigotWorldConfig;
|
||||
|
||||
@@ -562,4 +567,52 @@ public class PaperWorldConfig {
|
||||
@@ -567,4 +572,52 @@ public class PaperWorldConfig {
|
||||
private void disableRelativeProjectileVelocity() {
|
||||
disableRelativeProjectileVelocity = getBoolean("game-mechanics.disable-relative-projectile-velocity", false);
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From cd3d2ecbf1ff7fc3629cc18b4cf2e21c9c2d49fa Mon Sep 17 00:00:00 2001
|
||||
From 8eaa4bebd35c694f61907c6e728661f8e7ec4899 Mon Sep 17 00:00:00 2001
|
||||
From: kickash32 <kickash32@gmail.com>
|
||||
Date: Mon, 19 Aug 2019 01:27:58 +0500
|
||||
Subject: [PATCH] implement optional per player mob spawns
|
||||
|
||||
|
||||
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
index 8de6c4816c..ddec62fbf5 100644
|
||||
index 8de6c4816..ddec62fbf 100644
|
||||
--- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
@@ -74,6 +74,8 @@ public class WorldTimingsHandler {
|
||||
|
@ -27,10 +27,10 @@ index 8de6c4816c..ddec62fbf5 100644
|
|||
|
||||
public static Timing getTickList(WorldServer worldserver, String timingsType) {
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index e7bbeef74d..246bb4b014 100644
|
||||
index b1ad22c9f..09c8ea2ed 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -615,4 +615,9 @@ public class PaperWorldConfig {
|
||||
@@ -620,4 +620,9 @@ public class PaperWorldConfig {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -42,7 +42,7 @@ index e7bbeef74d..246bb4b014 100644
|
|||
}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
|
||||
new file mode 100644
|
||||
index 0000000000..9ebd7ecb7a
|
||||
index 000000000..9ebd7ecb7
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
|
||||
@@ -0,0 +1,253 @@
|
||||
|
@ -301,7 +301,7 @@ index 0000000000..9ebd7ecb7a
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java
|
||||
new file mode 100644
|
||||
index 0000000000..4f13d3ff83
|
||||
index 000000000..4f13d3ff8
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java
|
||||
@@ -0,0 +1,241 @@
|
||||
|
@ -547,7 +547,7 @@ index 0000000000..4f13d3ff83
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 8d7971ad80..e7539dd791 100644
|
||||
index 8d7971ad8..e7539dd79 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -555,7 +555,22 @@ public class ChunkProviderServer extends IChunkProvider {
|
||||
|
@ -601,7 +601,7 @@ index 8d7971ad80..e7539dd791 100644
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index 106b1ffe07..fa79d0bed6 100644
|
||||
index 106b1ffe0..fa79d0bed 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -80,6 +80,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
|
@ -633,7 +633,7 @@ index 106b1ffe07..fa79d0bed6 100644
|
|||
return this.cv;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
index a7fc34f850..612b9b7e33 100644
|
||||
index a7fc34f85..612b9b7e3 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
|
||||
@@ -253,6 +253,7 @@ public class EntityTypes<T extends Entity> {
|
||||
|
@ -645,7 +645,7 @@ index a7fc34f850..612b9b7e33 100644
|
|||
return this.ba;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
index 31d106f951..59e74900f8 100644
|
||||
index 31d106f95..59e74900f 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
@@ -77,7 +77,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
|
||||
|
@ -684,7 +684,7 @@ index 31d106f951..59e74900f8 100644
|
|||
|
||||
private static double a(ChunkCoordIntPair chunkcoordintpair, Entity entity) {
|
||||
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||
index c6ea37ffbd..9d4a96ae49 100644
|
||||
index c6ea37ffb..9d4a96ae4 100644
|
||||
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
|
||||
@@ -3,6 +3,7 @@ package net.minecraft.server;
|
||||
|
@ -757,7 +757,7 @@ index c6ea37ffbd..9d4a96ae49 100644
|
|||
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 71939e8086..bd1e4dbaed 100644
|
||||
index 71939e808..bd1e4dbae 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -999,7 +999,20 @@ public class WorldServer extends World {
|
||||
|
@ -802,5 +802,5 @@ index 71939e8086..bd1e4dbaed 100644
|
|||
|
||||
@Override
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 1fe0cdfc1001d7f82bf1bcf6f6655298637da125 Mon Sep 17 00:00:00 2001
|
||||
From cb364d0e7fd693372db414ea9de36c7081dfe2f8 Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Wed, 2 Mar 2016 02:17:54 -0600
|
||||
Subject: [PATCH] Generator Settings
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 246bb4b01..29fd49968 100644
|
||||
index 09c8ea2ed..7723b1c15 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -620,4 +620,9 @@ public class PaperWorldConfig {
|
||||
@@ -625,4 +625,9 @@ public class PaperWorldConfig {
|
||||
private void perPlayerMobSpawns() {
|
||||
perPlayerMobSpawns = getBoolean("per-player-mob-spawns", false);
|
||||
}
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 52a8681d94a5ea7b67abdc6ef1e890901a0c6632 Mon Sep 17 00:00:00 2001
|
||||
From 0bf48165d5c0504425d76d328c1f74a143af541e Mon Sep 17 00:00:00 2001
|
||||
From: Phoenix616 <mail@moep.tv>
|
||||
Date: Sun, 15 Sep 2019 11:32:32 -0500
|
||||
Subject: [PATCH] Fix zero-tick instant grow farms MC-113809
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 29fd499683..7ddcaeaa75 100644
|
||||
index 7723b1c15..af07f9a16 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -568,6 +568,11 @@ public class PaperWorldConfig {
|
||||
@@ -573,6 +573,11 @@ public class PaperWorldConfig {
|
||||
disableRelativeProjectileVelocity = getBoolean("game-mechanics.disable-relative-projectile-velocity", false);
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@ index 29fd499683..7ddcaeaa75 100644
|
|||
public Map<Material, Integer> altItemDespawnRateMap;
|
||||
private void altItemDespawnRate() {
|
||||
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
||||
index e077359b02..619237d68d 100644
|
||||
index e077359b0..619237d68 100644
|
||||
--- a/src/main/java/net/minecraft/server/Block.java
|
||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||
@@ -44,6 +44,7 @@ public class Block implements IMaterial {
|
||||
|
@ -33,7 +33,7 @@ index e077359b02..619237d68d 100644
|
|||
private final boolean g;
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
|
||||
index ffb65776c5..3a9c3b54a9 100644
|
||||
index ffb65776c..3a9c3b54a 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockBamboo.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockBamboo.java
|
||||
@@ -85,6 +85,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
|
||||
|
@ -45,7 +45,7 @@ index ffb65776c5..3a9c3b54a9 100644
|
|||
int i = this.b((IBlockAccess) world, blockposition) + 1;
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
|
||||
index 29f9ff6c18..124b4b4b00 100644
|
||||
index 29f9ff6c1..124b4b4b0 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockCactus.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
|
||||
@@ -21,6 +21,7 @@ public class BlockCactus extends Block {
|
||||
|
@ -57,7 +57,7 @@ index 29f9ff6c18..124b4b4b00 100644
|
|||
|
||||
if (world.isEmpty(blockposition1)) {
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockChorusFlower.java b/src/main/java/net/minecraft/server/BlockChorusFlower.java
|
||||
index 74fa4889ff..cde2524ca9 100644
|
||||
index 74fa4889f..cde2524ca 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockChorusFlower.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockChorusFlower.java
|
||||
@@ -22,6 +22,7 @@ public class BlockChorusFlower extends Block {
|
||||
|
@ -69,7 +69,7 @@ index 74fa4889ff..cde2524ca9 100644
|
|||
|
||||
if (world.isEmpty(blockposition1) && blockposition1.getY() < 256) {
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
|
||||
index ff674a9d5b..a4850c0705 100644
|
||||
index ff674a9d5..a4850c070 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockReed.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockReed.java
|
||||
@@ -23,6 +23,7 @@ public class BlockReed extends Block {
|
||||
|
@ -81,7 +81,7 @@ index ff674a9d5b..a4850c0705 100644
|
|||
|
||||
for (i = 1; world.getType(blockposition.down(i)).getBlock() == this; ++i) {
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index bd1e4dbaed..5b18f4bd52 100644
|
||||
index bd1e4dbae..5b18f4bd5 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -568,7 +568,9 @@ public class WorldServer extends World {
|
||||
|
@ -95,5 +95,5 @@ index bd1e4dbaed..5b18f4bd52 100644
|
|||
|
||||
Fluid fluid = iblockdata.p();
|
||||
--
|
||||
2.22.1
|
||||
2.23.0
|
||||
|
||||
|
|
Loading…
Reference in a new issue