mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-06-28 15:44:59 +02:00
Port more patches
I got all the purpur patches mentioned in #37 and ported them by also adding the squids EAR immunity patch. Ported also 2 useful patches from Rainforest. Unfortunately this is 1.16.2 only and thus 1.16.1 would only receive: - from purpur: the MC-4 fix and the squid EAR immunity. - from rainforest: all patches that have been ported. Closes #37
This commit is contained in:
Ivan Pekov
GitHub
parent
d25e6b6de6
commit
5765602020
26
PATCHES.md
26
PATCHES.md
|
|
@ -18,32 +18,48 @@ # Patches
|
|||
| server | Add config Yatopia command and basic settings | tr7zw | |
|
||||
| api | Add getLastTickMs api | tr7zw | |
|
||||
| server | Add getLastTickMs api | tr7zw | |
|
||||
| server | Add more dupe options | Mariell Hoversholm | |
|
||||
| server | Add option to disable saving projectiles to disk | William Blake Galbreath | |
|
||||
| server | Add permission for F3+N debug | William Blake Galbreath | |
|
||||
| server | Akarin Updated Save json list async | tsao chi | |
|
||||
| server | Allow anvil colors | William Blake Galbreath | |
|
||||
| api | Allow inventory resizing | William Blake Galbreath | |
|
||||
| server | Allow leashing villagers | William Blake Galbreath | |
|
||||
| server | Allow soil to moisten from water directly under it | William Blake Galbreath | |
|
||||
| server | Allow to change the piston push limit | tr7zw | |
|
||||
| server | Alternative Keepalive Handling | William Blake Galbreath | |
|
||||
| server | Apply advancements async | Mariell Hoversholm | |
|
||||
| server | Avoid double I/O operation on load player file | ㄗㄠˋ ㄑㄧˊ | |
|
||||
| server | Barrels and enderchests 6 rows | William Blake Galbreath | |
|
||||
| server | Brandings | tr7zw | |
|
||||
| server | Breedable Polar Bears | William Blake Galbreath | |
|
||||
| server | Charged creeper naturally spawn | William Blake Galbreath | |
|
||||
| server | Configurable TPS Catchup | William Blake Galbreath | |
|
||||
| server | Configurable villager brain ticks | William Blake Galbreath | |
|
||||
| server | Cows eat mushrooms | William Blake Galbreath | |
|
||||
| server | Custom brand name | Mariell Hoversholm | |
|
||||
| api | Default permissions | William Blake Galbreath | |
|
||||
| server | Disable the Snooper | Sotr | |
|
||||
| server | Don't load chunk with seed based feature search | Phoenix616 | |
|
||||
| server | Don't trigger Lootable Refresh for non player interaction | Aikar | |
|
||||
| server | Don't wake up entities when damage event is cancelled | Phoenix616 | |
|
||||
| server | Dont send useless entity packets | William Blake Galbreath | |
|
||||
| server | Entity lifespan | William Blake Galbreath | |
|
||||
| server | Fix 'outdated server' showing in ping before server fully | William Blake Galbreath | |
|
||||
| server | Fix lead fall dmg config | tr7zw | |
|
||||
| server | Fix the dead lagging the server | William Blake Galbreath | |
|
||||
| server | Giants AI settings | William Blake Galbreath | |
|
||||
| server | Global Eula file | tr7zw | |
|
||||
| server | Heavily optimize furnance fuel and recipe lookups | tr7zw | |
|
||||
| server | Hopper Optimizations | Phoenix616 | |
|
||||
| server | Illusioners AI settings | William Blake Galbreath | |
|
||||
| server | Implement bed explosion options | William Blake Galbreath | |
|
||||
| server | Implement respawn anchor explosion options | William Blake Galbreath | |
|
||||
| server | Improve Hopper Performance | Aikar | |
|
||||
| server | Item stuck sleep config | tr7zw | |
|
||||
| api | Kill AnnotationTest | tr7zw | |
|
||||
| server | Lagging threshold | William Blake Galbreath | |
|
||||
| server | MC-4 Fix - Item position desync | William Blake Galbreath | |
|
||||
| api | Modify POM | tr7zw | |
|
||||
| server | Modify POM | tr7zw | |
|
||||
| server | Modify default configs | tr7zw | |
|
||||
|
|
@ -55,22 +71,32 @@ # Patches
|
|||
| server | Optimize player loops around weather | MrIvanPlays | |
|
||||
| server | Optimize redstone algorithm | theosib | egg82 |
|
||||
| server | Option for simpler Villagers | tr7zw | |
|
||||
| server | Option to toggle milk curing bad omen | William Blake Galbreath | |
|
||||
| server | Origami Server Config | Phoenix616 | |
|
||||
| server | PaperMC - Buffer joins | Shane Freeder | |
|
||||
| server | Per entity (type) collision settings | MrIvanPlays | tr7zw |
|
||||
| server | Phantoms attracted to crystals and crystals shoot phantoms | William Blake Galbreath | |
|
||||
| server | Player-saving-async-FileIO | tr7zw | |
|
||||
| server | Purpur config files | William Blake Galbreath | |
|
||||
| server | Rabbit naturally spawn toast and killer | William Blake Galbreath | |
|
||||
| server | Redirect Configs | tr7zw | |
|
||||
| server | Redstone deactivates spawners | draycia | |
|
||||
| api | Remove Streams using IntelliJ IDEA | ㄗㄠˋ ㄑㄧˊ | |
|
||||
| server | Remove Streams using IntelliJ IDEA | ㄗㄠˋ ㄑㄧˊ | |
|
||||
| server | Remove a few more streams | Sotr | |
|
||||
| server | Remove stream for ender teleport | Sotr | |
|
||||
| server | Remove vanilla profiler callers | Sotr | |
|
||||
| server | Skip events if there's no listeners | William Blake Galbreath | |
|
||||
| server | Snowman drop and put back pumpkin | William Blake Galbreath | |
|
||||
| server | Squid EAR immunity | William Blake Galbreath | |
|
||||
| server | Swaps the predicate order of collision | ㄗㄠˋ ㄑㄧˊ | |
|
||||
| server | Tulips change fox type | William Blake Galbreath | |
|
||||
| server | Tweak Explosions | Aikar | |
|
||||
| server | Use block distance in portal search radius | Patrick Hemmer | |
|
||||
| server | Villagers follow emerald blocks | William Blake Galbreath | |
|
||||
| api | Yatopia API Bundle | Bud Gidiere | |
|
||||
| server | Yatopia-Server-Fixes | Bud Gidiere | |
|
||||
| server | Zombie horse naturally spawn | William Blake Galbreath | |
|
||||
| server | dont load chunks for physics | Aikar | |
|
||||
| server | lithium MixinBiome | JellySquid | |
|
||||
| server | lithium MixinBox | JellySquid | |
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Default-permissions
|
||||
Default-permissions&Allow-inventory-resizing
|
||||
|
|
@ -1 +1 @@
|
|||
Purpur-config-files&Lagging-threshold&Configurable-villager-brain-ticks&Alternative-Keepalive-Handling&Fix-outdated-server-showing-in-ping-before-server-fu&Dont-send-useless-entity-packets&Fix-the-dead-lagging-the-server&Skip-events-if-there-s-no-listeners&Add-permission-for-F3-N-debug&Configurable-TPS-Catchup&Add-option-to-disable-saving-projectiles-to-disk&Add-5-second-tps-average-in-tps
|
||||
Purpur-config-files&Lagging-threshold&Configurable-villager-brain-ticks&Alternative-Keepalive-Handling&Fix-outdated-server-showing-in-ping-before-server-fu&Dont-send-useless-entity-packets&Fix-the-dead-lagging-the-server&Skip-events-if-there-s-no-listeners&Add-permission-for-F3-N-debug&Configurable-TPS-Catchup&Add-option-to-disable-saving-projectiles-to-disk&Add-5-second-tps-average-in-tps&Barrels-and-enderchests-6-rows&Tulips-change-fox-type&Giants-AI-settings&Illusioners-AI-settings&Zombie-horse-naturally-spawn&Charged-creeper-naturally-spawn&Rabbit-naturally-spawn-toast-and-killer&Cows-eat-mushrooms&Snowman-drop-and-put-back-pumpkin&Allow-soil-to-moisten-from-water-directly-under-it&Option-to-toggle-milk-curing-bad-omen&Villagers-follow-emerald-blocks&Allow-leashing-villagers&Implement-respawn-anchor-explosion-options&Implement-bed-explosion-options&Entity-lifespan&Redstone-deactivates-spawners&MC-4-Fix-Item-position-desync&Breedable-Polar-Bears&Phantoms-attracted-to-crystals-and-crystals-shoot-ph&Add-option-to-disable-dolphin-treasure-searching&Add-no-tick-block-list&Allow-anvil-colors&PaperMC-Buffer-joins&Squid-EAR-immunity
|
||||
|
|
@ -1 +1 @@
|
|||
Add-Rainforest-config&Apply-advancements-async&Optimize-redstone-algorithm
|
||||
Add-Rainforest-config&Apply-advancements-async&Optimize-redstone-algorithm&Add-more-dupe-options&Custom-brand-name
|
||||
|
|
@ -5,6 +5,19 @@ Subject: [PATCH] Yatopia API Bundle
|
|||
|
||||
Lagging threshold + Purpur & Rainforest & Origami config
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
|
||||
index b42091752981a1f309ab350e9a394092cb334824..ba03cb48d483b6955d4635e9071fff5bfa472811 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
|
||||
@@ -206,4 +206,8 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
|
||||
GoalKey<Zombie> ZOMBIE_ATTACK = GoalKey.of(Zombie.class, NamespacedKey.minecraft("zombie_attack"));
|
||||
GoalKey<Creature> STROLL_VILLAGE_GOLEM = GoalKey.of(Creature.class, NamespacedKey.minecraft("stroll_village_golem"));
|
||||
GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
|
||||
+ // Yatopia start
|
||||
+ GoalKey<Phantom> FIND_CRYSTAL_GOAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("find_crystal_goal"));
|
||||
+ GoalKey<Phantom> ORBIT_CRYSTAL_GOAL = GoalKey.of(Phantom.class, NamespacedKey.minecraft("orbit_crystal_goal"));
|
||||
+ // Yatopia end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 62cc1c74c11f56dcbd1e24e9c5478497742e6351..59787c474f1a17dff156e74107f880ac083a7cb3 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -395,10 +395,10 @@ index a60634fc455e8a59399020689b70eb64b6824d12..cb4a89940cf02de5c3eefc5c746397a9
|
|||
this.setAllowFlight(dedicatedserverproperties.allowFlight);
|
||||
this.setResourcePack(dedicatedserverproperties.resourcePack, this.aZ());
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 6f24467f5d790cbc5726e8ccabe7b0197f7beb21..724aab2cc747940e31c01a52a258e3519e6bda79 100644
|
||||
index 960ab2a7c65a77e22acad2280f39a79a1556813e..39afc1fdd000f990675ea1d2ba067929e80dc5ad 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1033,7 +1033,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@@ -1034,7 +1034,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
|
||||
VoxelShape voxelshape = this.world.getWorldBorder().c();
|
||||
Stream<VoxelShape> stream = !this.world.getWorldBorder().isInBounds(axisalignedbb) ? Stream.empty() : Stream.of(voxelshape); // Paper
|
||||
|
|
@ -408,7 +408,7 @@ index 6f24467f5d790cbc5726e8ccabe7b0197f7beb21..724aab2cc747940e31c01a52a258e351
|
|||
});
|
||||
StreamAccumulator<VoxelShape> streamaccumulator = new StreamAccumulator<>(Stream.concat(stream1, stream));
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 730a0262f400a9974f89ecdf8b208e54cf7952f6..99c6e562b310e7268eabee0ddd7ec9e6960edd4f 100644
|
||||
index 150075f5e78fca681e9e1d0582d7d92b904cd121..e8a01779b578a59d5002ca58ed4469a8bb83291e 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -266,6 +266,7 @@ public abstract class EntityLiving extends Entity {
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ index 0000000000000000000000000000000000000000..3c6dc395dd26b995f63a15e3f9a0a86a
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 99c6e562b310e7268eabee0ddd7ec9e6960edd4f..ef9958e3922bc306e38c76eb67ddbd1f38f4c547 100644
|
||||
index e8a01779b578a59d5002ca58ed4469a8bb83291e..4686130f88562de61022f52c3b83428b2a3eecab 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -2849,7 +2849,7 @@ public abstract class EntityLiving extends Entity {
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ index ce4ebc96c01f3dacf4e4d0569d86f52140440d43..a52c0391b171c8a57de75f87c534ce1e
|
|||
nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft());
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 4c6e708b6d6af45159315dc6ab5fdf72320d9825..2b7fb65942f5d22737cbbf0f8e7ef2194fc607a2 100644
|
||||
index bf39ee4b22b69ff5da691aeac65bfdb34058a9fb..ebd34ee3cd12cd359be6c0b019fd60cb35af3918 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -1284,6 +1284,28 @@ public abstract class PlayerList {
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ index 5d3bb5f393a1e0e4a2e8b9a466530a91279697a9..7f084e7f11a829c10d113c7fb39eec0b
|
|||
if (enumdirection2 != EnumDirection.DOWN && world.isBlockFacePowered(blockposition1.shift(enumdirection2), enumdirection2)) {
|
||||
return true;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index ef9958e3922bc306e38c76eb67ddbd1f38f4c547..2fee8f65bdf782e150bc277108d72d93320e5ac2 100644
|
||||
index 4686130f88562de61022f52c3b83428b2a3eecab..3de557aba9222b2144485185fbfaaa7fd5b046bc 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -2568,10 +2568,12 @@ public abstract class EntityLiving extends Entity {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ index fb7551f79f3e2e7e834359ef701ff7e568882a7f..0566088538c2b99ff74a408b67a9edee
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
|
||||
index 1b2e395cc141bf700e1f7c24fe8ee7dc68b25513..416d421c3ff49125cd540a6e360523775f034689 100644
|
||||
index 210f6b995565af5a299d6ba855a1de224102150b..d4147e93941f32da8dbb890e03cf306d8325edf0 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityVillager.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
|
||||
@@ -27,6 +27,7 @@ import org.bukkit.event.entity.VillagerReplenishTradeEvent;
|
||||
|
|
@ -32,7 +32,7 @@ index 1b2e395cc141bf700e1f7c24fe8ee7dc68b25513..416d421c3ff49125cd540a6e36052377
|
|||
private static final DataWatcherObject<VillagerData> br = DataWatcher.a(EntityVillager.class, DataWatcherRegistry.q);
|
||||
public static final Map<Item, Integer> bp = ImmutableMap.of(Items.BREAD, 4, Items.POTATO, 1, Items.CARROT, 1, Items.BEETROOT, 1);
|
||||
private static final Set<Item> bs = ImmutableSet.of(Items.BREAD, Items.POTATO, Items.CARROT, Items.WHEAT, Items.WHEAT_SEEDS, Items.BEETROOT, new Item[]{Items.BEETROOT_SEEDS});
|
||||
@@ -64,12 +65,52 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
@@ -64,24 +65,60 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
super(entitytypes, world);
|
||||
this.by = new Reputation();
|
||||
((Navigation) this.getNavigation()).a(true);
|
||||
|
|
@ -47,9 +47,22 @@ index 1b2e395cc141bf700e1f7c24fe8ee7dc68b25513..416d421c3ff49125cd540a6e36052377
|
|||
this.brainTickOffset = getRandom().nextInt(100); // Purpur
|
||||
}
|
||||
|
||||
// Purpur start
|
||||
- @Override
|
||||
- protected void initPathfinder() {
|
||||
- if (world.purpurConfig.villagerFollowEmeraldBlock) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.0D, false, TEMPT_ITEMS));
|
||||
- }
|
||||
-
|
||||
@Override
|
||||
public boolean a(EntityHuman entityhuman) {
|
||||
return world.purpurConfig.villagerCanBeLeashed && !this.isLeashed();
|
||||
}
|
||||
// Purpur end
|
||||
|
||||
+ // Yatopia start
|
||||
+ @Override
|
||||
+ protected void initPathfinder() {
|
||||
+ if (world.purpurConfig.villagerFollowEmeraldBlock) this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.0D, false, TEMPT_ITEMS));
|
||||
+ if (!simplerVillagerBehavior) {
|
||||
+ // safety
|
||||
+ return;
|
||||
|
|
@ -85,7 +98,7 @@ index 1b2e395cc141bf700e1f7c24fe8ee7dc68b25513..416d421c3ff49125cd540a6e36052377
|
|||
@Override
|
||||
public BehaviorController<EntityVillager> getBehaviorController() {
|
||||
return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
|
||||
@@ -82,6 +123,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
@@ -94,6 +131,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
|
||||
@Override
|
||||
protected BehaviorController<?> a(Dynamic<?> dynamic) {
|
||||
|
|
@ -93,7 +106,7 @@ index 1b2e395cc141bf700e1f7c24fe8ee7dc68b25513..416d421c3ff49125cd540a6e36052377
|
|||
BehaviorController<EntityVillager> behaviorcontroller = this.cJ().a(dynamic);
|
||||
|
||||
this.a(behaviorcontroller);
|
||||
@@ -159,6 +201,27 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
@@ -171,6 +209,27 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
super.inactiveTick();
|
||||
}
|
||||
// Spigot End
|
||||
|
|
@ -121,7 +134,7 @@ index 1b2e395cc141bf700e1f7c24fe8ee7dc68b25513..416d421c3ff49125cd540a6e36052377
|
|||
|
||||
@Override
|
||||
protected void mobTick() { mobTick(false); }
|
||||
@@ -168,6 +231,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
@@ -180,6 +239,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
boolean tick = (world.getTime() + brainTickOffset) % world.purpurConfig.villagerBrainTicks == 0;
|
||||
if (world.getMinecraftServer().lagging ? tick : world.purpurConfig.villagerUseBrainTicksOnlyWhenLagging || tick)
|
||||
// Purpur end
|
||||
|
|
@ -135,7 +148,7 @@ index 1b2e395cc141bf700e1f7c24fe8ee7dc68b25513..416d421c3ff49125cd540a6e36052377
|
|||
if (!inactive) this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error // Paper
|
||||
//this.world.getMethodProfiler().exit(); // Akarin - remove caller
|
||||
if (this.bF) {
|
||||
@@ -333,6 +403,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
@@ -345,6 +411,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
return this.bD == 0 || this.bD < 2 && this.world.getTime() > this.bC + 2400L;
|
||||
}
|
||||
|
||||
|
|
@ -143,7 +156,7 @@ index 1b2e395cc141bf700e1f7c24fe8ee7dc68b25513..416d421c3ff49125cd540a6e36052377
|
|||
public boolean fc() {
|
||||
long i = this.bC + 12000L;
|
||||
long j = this.world.getTime();
|
||||
@@ -355,6 +426,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
@@ -367,6 +434,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
return this.fn() && this.fm();
|
||||
}
|
||||
|
||||
|
|
@ -151,7 +164,7 @@ index 1b2e395cc141bf700e1f7c24fe8ee7dc68b25513..416d421c3ff49125cd540a6e36052377
|
|||
private void fo() {
|
||||
int i = 2 - this.bD;
|
||||
|
||||
@@ -585,6 +657,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
@@ -597,6 +665,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
}
|
||||
|
||||
private void a(Entity entity) {
|
||||
|
|
@ -159,7 +172,7 @@ index 1b2e395cc141bf700e1f7c24fe8ee7dc68b25513..416d421c3ff49125cd540a6e36052377
|
|||
if (this.world instanceof WorldServer) {
|
||||
Optional<List<EntityLiving>> optional = this.bg.getMemory(MemoryModuleType.VISIBLE_MOBS);
|
||||
|
||||
@@ -610,6 +683,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
@@ -622,6 +691,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
}
|
||||
|
||||
public void a(MemoryModuleType<GlobalPos> memorymoduletype) {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Redirect Configs
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/proximyst/rainforest/RainforestConfig.java b/src/main/java/com/proximyst/rainforest/RainforestConfig.java
|
||||
index 0d854bda9611b45d78815f9fe9cafb8901de210f..c4092282040d4e7cd960b6922feb8b179a6a8ada 100644
|
||||
index f6623032e5d4034c104aa1fc6ff4265169e462ba..c9a61bf6531d761780ac66b69d06a1d036f988d5 100644
|
||||
--- a/src/main/java/com/proximyst/rainforest/RainforestConfig.java
|
||||
+++ b/src/main/java/com/proximyst/rainforest/RainforestConfig.java
|
||||
@@ -37,6 +37,8 @@ public final class RainforestConfig {
|
||||
|
|
@ -21,30 +21,16 @@ index 0d854bda9611b45d78815f9fe9cafb8901de210f..c4092282040d4e7cd960b6922feb8b17
|
|||
|
||||
version = getInt("config-version", 1);
|
||||
set("config-version", 1);
|
||||
- readConfig(RainforestConfig.class, null);
|
||||
+ */
|
||||
+ config = dev.tr7zw.yatopia.YatopiaConfig.config;
|
||||
+ CONFIG_FILE = dev.tr7zw.yatopia.YatopiaConfig.CONFIG_FILE;
|
||||
+ verbose = dev.tr7zw.yatopia.YatopiaConfig.verbose;
|
||||
+ version = dev.tr7zw.yatopia.YatopiaConfig.version;
|
||||
+ //readConfig(RainforestConfig.class, null); // todo: when options actually get ported, uncomment this
|
||||
readConfig(RainforestConfig.class, null);
|
||||
+ // Yatopia end
|
||||
}
|
||||
|
||||
protected static void logError(String s) {
|
||||
diff --git a/src/main/java/com/proximyst/rainforest/RainforestWorldConfig.java b/src/main/java/com/proximyst/rainforest/RainforestWorldConfig.java
|
||||
index 22d920686418e86aec8be37f125123682af023a3..081a5344b86e300ae7aa722b9b0ca84c77844e49 100644
|
||||
--- a/src/main/java/com/proximyst/rainforest/RainforestWorldConfig.java
|
||||
+++ b/src/main/java/com/proximyst/rainforest/RainforestWorldConfig.java
|
||||
@@ -22,7 +22,7 @@ public final class RainforestWorldConfig {
|
||||
|
||||
public void init() {
|
||||
log("-------- World Settings For [" + worldName + "] --------");
|
||||
- RainforestConfig.readConfig(RainforestWorldConfig.class, this);
|
||||
+ //RainforestConfig.readConfig(RainforestWorldConfig.class, this); // Yatopia - todo: when options are ported, uncomment this
|
||||
}
|
||||
|
||||
private void set(String path, Object val) {
|
||||
diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
|
||||
index 3d71ee447b0d45c50ed6f2f17ad5184d28d3bc08..965cc06a826c7d827e6b9a9e586738bfddc974d8 100644
|
||||
--- a/src/main/java/de/minebench/origami/OrigamiConfig.java
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@ index 0566088538c2b99ff74a408b67a9edee4751f904..db5e7cb183682f5cf7049190ae49a835
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 724aab2cc747940e31c01a52a258e3519e6bda79..e19d363e76158335acbabaee2bae295dfee38cf8 100644
|
||||
index 39afc1fdd000f990675ea1d2ba067929e80dc5ad..678f9b908bbb3ccd847a8df55d7afbe5a301fdae 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1264,6 +1264,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@@ -1265,6 +1265,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
this.fallDistance = 0.0F;
|
||||
} else if (d0 < 0.0D) {
|
||||
this.fallDistance = (float) ((double) this.fallDistance - d0);
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Optimize player loops around weather
|
|||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 11ac68333a97c21607bd4ce6dd936a69003f2bea..8ba9a5ef645dcebf12894c3bd236aef006e473bf 100644
|
||||
index ebf4ceb084d9e7bd3eac3e0c90ba064bd9d0a8a7..e30871dd34e2dae074e36c297f34a7dede709e29 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -814,12 +814,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user