9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-21 07:49:22 +00:00

Make saving fireworks configurable

This commit is contained in:
Martijn Muijsers
2022-12-26 07:32:09 +01:00
parent f7f1c06f89
commit 9a86c9cc68
101 changed files with 111 additions and 48 deletions

View File

@@ -0,0 +1,63 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martijn Muijsers <martijnmuijsers@live.nl>
Date: Mon, 26 Dec 2022 07:30:30 +0100
Subject: [PATCH] Make saving fireworks configurable
License: MIT (https://opensource.org/licenses/MIT)
Gale - https://galemc.org
This patch is based on the following patch:
"Don't save Fireworks"
By: Aikar <aikar@aikar.co>
As part of: EmpireCraft (https://github.com/starlis/empirecraft)
Licensed under: MIT (https://opensource.org/licenses/MIT)
* EmpireCraft description *
Fireworks can bug out and not detonate, and an automated
launcher can very easily fill a chunk.
Prevent saving Fireworks so that chunk unloads will wipe a chunks fireworks in this case.
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
index 5406925cd66f46ab8744123c670d72cea7bfc3a1..0061af7c377793568f292be1850644dcca9e144a 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
@@ -358,4 +358,12 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
public boolean isAttackable() {
return false;
}
+
+ // Gale start - EMC - make saving fireworks configurable
+ @Override
+ public boolean shouldBeSaved() {
+ return this.level.galeConfig().smallOptimizations.saveFireworks;
+ }
+ // Gale end - EMC - make saving fireworks configurable
+
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index d34ee90eaf160a72d4898feed13d94b0b61eded3..ccc36bb32b99de79ccc157a695fd83f007e7d86a 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -33,6 +33,20 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public SmallOptimizations smallOptimizations;
public class SmallOptimizations extends ConfigurationPart {
+ // Gale start - EMC - make saving fireworks configurable
+ /**
+ * Whether fireworks are saved when saving a chunk.
+ * <br>
+ * Fireworks can bug out and not detonate, and an automated launcher can very easily fill a chunk.
+ * If this option is true, chunk unloads will remove any fireworks, preventing this scenario.
+ * <ul>
+ * <li><i>Default</i>: true</li>
+ * <li><i>Vanilla</i>: true</li>
+ * </ul>
+ */
+ public boolean saveFireworks = true;
+ // Gale end - EMC - make saving fireworks configurable
+
// Gale start - Airplane - reduce projectile chunk loading
public MaxProjectileChunkLoads maxProjectileChunkLoads;
public class MaxProjectileChunkLoads extends ConfigurationPart {

View File

@@ -180,10 +180,10 @@ index 877e07c62a6235670c756edef3eebb385bccccd4..3b5b3750265ea72d6d0c33c7261f0dab
public double getLevelX() {
return (double) this.worldPosition.getX() + 0.5D;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index d34ee90eaf160a72d4898feed13d94b0b61eded3..729600e22e1fee8ae33e51ed2da66a489cec2659 100644
index ccc36bb32b99de79ccc157a695fd83f007e7d86a..0f2f14b0612f764a2780bc244c89db548997b2c1 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -116,6 +116,112 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -130,6 +130,112 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public int checkStuckInWall = 10;
// Gale end - Pufferfish - reduce in wall checks

View File

@@ -48,10 +48,10 @@ index b9fcff8862e624644fdb73afcb3ef2106b0a76fc..49f2c1ca0e175667202ba0d02175a61f
org.bukkit.event.entity.EntityDropItemEvent event = new org.bukkit.event.entity.EntityDropItemEvent(entity.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
entityitem.level.getCraftServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 729600e22e1fee8ae33e51ed2da66a489cec2659..9ac9873c4ffcbc88daf5ca3947cd60177cb0fe5d 100644
index 0f2f14b0612f764a2780bc244c89db548997b2c1..be563b466b9b9312254596ea3b8e116b28cf250c 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -222,6 +222,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -236,6 +236,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}

View File

@@ -59,10 +59,10 @@ index 72f1866226269396ba0f0c1be269e237925d9322..ea099989d633764489396a48d52db9f6
}
// Paper end - fix sand duping
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 9ac9873c4ffcbc88daf5ca3947cd60177cb0fe5d..82946c6784b9b42681e03a815d82931ae150aaba 100644
index be563b466b9b9312254596ea3b8e116b28cf250c..ffc6da34591bc071b425b5538dd2da95ff078dc8 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -241,4 +241,16 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -255,4 +255,16 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}

View File

@@ -49,10 +49,10 @@ index 18389f46902bb9879ac6d734723e9a720724dc48..613970368890d78ab589f654a66024ee
}
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 82946c6784b9b42681e03a815d82931ae150aaba..22321ab19af662c8f75620422c1775fe805356f3 100644
index ffc6da34591bc071b425b5538dd2da95ff078dc8..2d4d2f1b33b9b6ec937fc1da20573f685eb0cb29 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -248,7 +248,12 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -262,7 +262,12 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class Fixes extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable

View File

@@ -58,10 +58,10 @@ index 428523feaa4f30260e32ba03937e88200246c693..29afe1f873c9c87fe5a83f22025cf7f7
// Paper start - fix MC-252817 (green map markers do not disappear)
this.getFramedMapIdFromItem(itemstack).ifPresent((i) -> {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 22321ab19af662c8f75620422c1775fe805356f3..075af07a5c0e8328fb411d22fd29cea9c2b07711 100644
index 2d4d2f1b33b9b6ec937fc1da20573f685eb0cb29..ab5b2db71038decf68f3b0072367e986d5b25f82 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -254,6 +254,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -268,6 +268,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc238526 = false;
// Gale end - Purpur - fix MC-238526

View File

@@ -64,10 +64,10 @@ index 68a5ee85e64802e4509ba0d184fc0ceb3cbe2d11..8ee1a0626e5a6c0ad19a25b8f476a2e1
entitycow.setPersistenceRequired();
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 075af07a5c0e8328fb411d22fd29cea9c2b07711..a774fbeaa3829b1ae702fb61a0acb9d69d18a081 100644
index ab5b2db71038decf68f3b0072367e986d5b25f82..6d0a0535f6e0b1dbcb8d1dfd99fe0adb50ef8ad6 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -248,7 +248,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -262,7 +262,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class Fixes extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable

View File

@@ -65,10 +65,10 @@ index 6558b0d4bea99948fdc2b51751f3cfdc239d4b67..bedb5b8ee24817a494455f17e1f32b42
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index a774fbeaa3829b1ae702fb61a0acb9d69d18a081..0ae303da1858ed75cb0eb4b224a0e21fa352fc70 100644
index 6d0a0535f6e0b1dbcb8d1dfd99fe0adb50ef8ad6..7fb76d13d15c5133099dde75410631c31ee53ce2 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -249,7 +249,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -263,7 +263,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
@@ -77,7 +77,7 @@ index a774fbeaa3829b1ae702fb61a0acb9d69d18a081..0ae303da1858ed75cb0eb4b224a0e21f
// Gale start - Purpur - fix MC-238526
@Setting("mc-238526")
public boolean mc238526 = false;
@@ -260,6 +260,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -274,6 +274,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc123848 = false;
// Gale end - Purpur - fix MC-123848

View File

@@ -35,10 +35,10 @@ index 39ea15c7577af186d93d4ad9a48034d746a86fc8..865eb39f4a1d2207c857acccc0695be9
}
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 0ae303da1858ed75cb0eb4b224a0e21fa352fc70..c1349f89da677297ca1c24e375addaed1f91953c 100644
index 7fb76d13d15c5133099dde75410631c31ee53ce2..9254430412c59860d56cae6e46f8f64a3d1e2c87 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -265,6 +265,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -279,6 +279,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc121706 = false;
// Gale end - Purpur - fix MC-121706

View File

@@ -35,10 +35,10 @@ index 0dcae10fd05a8fe963fdedda8199aa09dc717c9a..328a232a517789f2b619debe99b7c43d
if (!this.abilities.invulnerable) {
if (!this.level.isClientSide) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index c1349f89da677297ca1c24e375addaed1f91953c..a7228108ffb447b27f254737a81709d0de2222f6 100644
index 9254430412c59860d56cae6e46f8f64a3d1e2c87..d190b3ab4ed9f0c183932d235f9f7752a6177f31 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -270,6 +270,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -284,6 +284,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc110386 = true;
// Gale end - Mirai - fix MC-110386

View File

@@ -49,10 +49,10 @@ index f80545f80948db27d1fbde77d0505c916eb504ed..2a596cc374206a85bb692f5e09ee2dd8
blockEntity.teleportCooldown = 100;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index a7228108ffb447b27f254737a81709d0de2222f6..824815ac8e1f90e2667b32b35c447a009a149cbb 100644
index d190b3ab4ed9f0c183932d235f9f7752a6177f31..f623518450d1d750b81b84da936282c2df949b7d 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -249,6 +249,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -263,6 +263,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom

View File

@@ -59,10 +59,10 @@ index 80aa539f7c6a6ee44338de084cdcdf5fb4ef996a..cb8fc8a88c14d2374a0bbe35aa1c2056
return EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(blockposition)) ? true : this.level.getBlockState(blockposition.below()).is(Blocks.GRASS_BLOCK);
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 824815ac8e1f90e2667b32b35c447a009a149cbb..10cd0e029d40ae02d12be358be03141e7cf89017 100644
index f623518450d1d750b81b84da936282c2df949b7d..6bc83bfe35c52d314fde725c672de6971d8a86c5 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -244,6 +244,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -258,6 +258,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public GameplayMechanics gameplayMechanics;
public class GameplayMechanics extends ConfigurationPart {

View File

@@ -55,10 +55,10 @@ index 9788e477ff1446ad2ea3669922cc7dfc09900ce8..e615762a78dbf93584df5146939efa01
@Override
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 10cd0e029d40ae02d12be358be03141e7cf89017..24a6e2ef5472936f478b759e79197442490e3ada 100644
index 6bc83bfe35c52d314fde725c672de6971d8a86c5..711154b099acfe51705503ea5784727d4cac6ab1 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -245,6 +245,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -259,6 +259,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class GameplayMechanics extends ConfigurationPart {
public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks

View File

@@ -110,12 +110,12 @@ index efac4395fdb79a78fbb18a0f828b1a3c90b102fe..ef70179f71eb3f63f707d990bfc4d551
DyeColor enumcolor1 = ((Sheep) secondParent).getColor();
CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 24a6e2ef5472936f478b759e79197442490e3ada..b480d492d411d33393ac1b2f41bd4d62d232c568 100644
index 711154b099acfe51705503ea5784727d4cac6ab1..122361057f2b25072ca763df68d614c176c57b5d 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -33,6 +33,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public SmallOptimizations smallOptimizations;
public class SmallOptimizations extends ConfigurationPart {
@@ -47,6 +47,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean saveFireworks = true;
// Gale end - EMC - make saving fireworks configurable
+ // Gale start - carpet-fixes - optimize sheep offspring color
+ /**

View File

@@ -53,10 +53,10 @@ index 8fd080110ed4efaf6cb3a2561b32ed66ff8c78f0..b1a01ef0090718923aff4365d8e93c77
return stack.is(otherStack.getItem()) && ItemStack.tagMatches(stack, otherStack);
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index b480d492d411d33393ac1b2f41bd4d62d232c568..ce94f9a5bc826ce33ee63581ab864b04a8b4526e 100644
index 122361057f2b25072ca763df68d614c176c57b5d..72ab895b4b64d224b847ec330512f1aed0b39f6b 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -48,6 +48,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -62,6 +62,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean useOptimizedSheepOffspringColor = true;
// Gale end - carpet-fixes - optimize sheep offspring color

View File

@@ -31,10 +31,10 @@ index bf3bdbdb4384f374419f00635280305f84ce078c..0ce745f5a00d4db68e8559fc1826dace
this.firstTick = false;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index ce94f9a5bc826ce33ee63581ab864b04a8b4526e..3274742f667c9b0bec5f1bf8d03b2fd3165eb807 100644
index 72ab895b4b64d224b847ec330512f1aed0b39f6b..61d1cf5008da9969a08fcd3257f19c4d5c46ff16 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -263,6 +263,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -277,6 +277,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks
public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable

View File

@@ -27,10 +27,10 @@ index ce7f36f38165a58e3fab7a98bece75df2d0ec6ed..46dc2deb8eb066e51a03a010a7bd9204
if (this.entity instanceof LivingEntity) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 3274742f667c9b0bec5f1bf8d03b2fd3165eb807..ffc39061f2363b979590888e736dd7a53a0d256a 100644
index 61d1cf5008da9969a08fcd3257f19c4d5c46ff16..b18bc70c5ada1124e63cdbe8d75adf058a34bd4f 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -50,6 +50,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -64,6 +64,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean processFullEquipmentChangeIfOnlyDurabilityChanged = false; // Gale - Slice - ignore durability change equipment updates

View File

@@ -65,10 +65,10 @@ index 7df5ea545c19ccc43f553a229722c3fd88adc3ec..68e0f2208c5f098042ebfad08301e315
private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index ffc39061f2363b979590888e736dd7a53a0d256a..53bc702695674ea969a3a0b7c7946e1d9b4a4f82 100644
index b18bc70c5ada1124e63cdbe8d75adf058a34bd4f..a3fb445c105a0335bd3360122d39aea93ea2de59 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -261,12 +261,26 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -275,12 +275,26 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}
public GameplayMechanics gameplayMechanics;
@@ -96,7 +96,7 @@ index ffc39061f2363b979590888e736dd7a53a0d256a..53bc702695674ea969a3a0b7c7946e1d
public Fixes fixes;
public class Fixes extends ConfigurationPart {
@@ -301,6 +315,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -315,6 +329,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}

View File

@@ -31,10 +31,10 @@ index 0ce745f5a00d4db68e8559fc1826dace52ae44d8..54dac74a5de4f967b3af7a63c8977d56
entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - use EntityPortalExitEvent values
entity.setDeltaMovement(velocity); // Paper - use EntityPortalExitEvent values
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 53bc702695674ea969a3a0b7c7946e1d9b4a4f82..c45f4b9d06956a58b4e59afe70203ee8abbfccee 100644
index a3fb445c105a0335bd3360122d39aea93ea2de59..f2e8569007b9d52885696de76b1bd1e1035f8121 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -315,6 +315,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -329,6 +329,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}

View File

@@ -34,10 +34,10 @@ index 1c3718d9244513d9fc795dceb564a81375734557..20249e200781daf072ee24102aba6912
if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index c45f4b9d06956a58b4e59afe70203ee8abbfccee..5b5fb89408b201bc3f73cf3dd80a5f8856b48b68 100644
index f2e8569007b9d52885696de76b1bd1e1035f8121..75e0128d1f4f5b112f9908373b2e32941c68888e 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -258,6 +258,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -272,6 +272,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}

View File

@@ -79,10 +79,10 @@ index e9554db6c331beec32ce11bb6a939bb909b1a877..714863ce4d401887119a6eab49a6c041
if (iblockdata.is(BlockTags.CLIMBABLE)) {
this.lastClimbablePos = Optional.of(blockposition);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 5b5fb89408b201bc3f73cf3dd80a5f8856b48b68..4a338bbc038f70368adc1eb85c0c94312186cd80 100644
index 75e0128d1f4f5b112f9908373b2e32941c68888e..f611c38cb628569fbf3257e006f410d6f0a25d39 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -273,6 +273,18 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -287,6 +287,18 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean toSpawnPhantoms = false;
// Gale end - MultiPaper - don't load chunks to spawn phantoms

View File

@@ -38,10 +38,10 @@ index 9d74ef6973f6a9e12861256aa7032f8d746a97f5..285f99bdea5da7ff47889cdb55f94015
@Override
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 4a338bbc038f70368adc1eb85c0c94312186cd80..1458877261308dd067c9e46d943ec3af23788944 100644
index f611c38cb628569fbf3257e006f410d6f0a25d39..adf0489fac2798325123d42fd35a8b9b6865aa0b 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -317,6 +317,22 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -331,6 +331,22 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal

View File

@@ -36,10 +36,10 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..29c7f53a4fa88a77c4076a6294e689e4
} else {
this.wantedX = vec3.x;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 1458877261308dd067c9e46d943ec3af23788944..77398e2fc01a919b324b7952de4736807987549b 100644
index adf0489fac2798325123d42fd35a8b9b6865aa0b..cc25c05262929b946cf696a1df0f24a50508db5e 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -293,6 +293,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -307,6 +307,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class GameplayMechanics extends ConfigurationPart.Post {
public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks

Some files were not shown because too many files have changed in this diff Show More