mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2025-02-23 07:41:42 +01:00
add Mrivansplays patches
This commit is contained in:
parent
1b3e3b23a8
commit
51d48511bc
@ -45,15 +45,22 @@ # Patches
|
||||
| server | Heavily optimize furnance fuel and recipe lookups | tr7zw | |
|
||||
| server | Hopper Optimizations | Phoenix616 | |
|
||||
| server | Improve Hopper Performance | Aikar | |
|
||||
| server | Incremental player saving | Aikar | MrIvanPlays |
|
||||
| api | IntellaJ Code Clean Up | Bud Gidiere | |
|
||||
| api | IntellaJ Optimize Imports | Bud Gidiere | |
|
||||
| server | Intellij Code Clean Up | Bud Gidiere | |
|
||||
| server | Intellij Optimize Imports. | Bud Gidiere | |
|
||||
| server | Item stuck sleep config | tr7zw | |
|
||||
| api | Kill AnnotationTest | tr7zw | |
|
||||
| server | Lagging threshold | William Blake Galbreath | |
|
||||
| api | Modify POM | tr7zw | |
|
||||
| server | Modify POM | tr7zw | |
|
||||
| server | Modify default configs | tr7zw | |
|
||||
| server | Optimize BehaviorController | MrIvanPlays | |
|
||||
| server | Optimize Hopper logic | tr7zw | |
|
||||
| server | Optimize TileEntity loading | tr7zw | |
|
||||
| server | Optimize inventory API item handling | Phoenix616 | |
|
||||
| server | Optimize player loops around weather | MrIvanPlays | |
|
||||
| server | Optimize redstone algorithm | theosib | egg82 |
|
||||
| server | Option for simpler Villagers | tr7zw | |
|
||||
| server | Origami Server Config | Phoenix616 | |
|
||||
|
@ -1,16 +1,16 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 9 Aug 2020 21:19:15 +0300
|
||||
Date: Sun, 9 Aug 2020 16:44:48 -0500
|
||||
Subject: [PATCH] Incremental player saving
|
||||
|
||||
Co-authored-by: MrIvanPlays <ivan@mrivanplays.com>
|
||||
Ported to Yatopia and 1.16.1 by MrIvanPlays
|
||||
Co-authored-by: MrIvanPlays <ivan@mrivanplays.com>
|
||||
|
||||
diff --git a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
||||
index 7503322478048cdcca7659202596aea4d95fd835..6d3a2c874077f3abaeda1e365963ce601c901085 100644
|
||||
index 40f0bc601f0d11b0bfb15162fce17aaa70991f14..8b659311e3b6f45c0ee798efb6adb85cdeb710b0 100644
|
||||
--- a/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
||||
+++ b/src/main/java/dev/tr7zw/yatopia/YatopiaConfig.java
|
||||
@@ -223,4 +223,15 @@ public class YatopiaConfig {
|
||||
@@ -235,4 +235,15 @@ public class YatopiaConfig {
|
||||
fixFallDistance = getBoolean("settings.fixFallDistance", false);
|
||||
}
|
||||
|
||||
@ -28,10 +28,10 @@ index 7503322478048cdcca7659202596aea4d95fd835..6d3a2c874077f3abaeda1e365963ce60
|
||||
}
|
||||
\ No newline at end of file
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index f143624c072ddd300591bdadd3173c97e16973fe..348f25fb974a99e991090747cedb0acd7eade8e9 100644
|
||||
index 597419c23721059378943970b55d7a0dcb535037..f6ce27a5d1a44b2c6ec42842d51cb769138862f5 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -29,6 +29,7 @@ import java.util.concurrent.CompletableFuture;
|
||||
@@ -43,6 +43,7 @@ import org.bukkit.inventory.MainHand;
|
||||
public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
@ -40,10 +40,10 @@ index f143624c072ddd300591bdadd3173c97e16973fe..348f25fb974a99e991090747cedb0acd
|
||||
public NetworkManager networkManager; // Paper
|
||||
public final MinecraftServer server;
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 440c7f15e2e081ec13d6ab32177c70ef4959e8bb..6a151e60b7f203b629c55c80ac998a80fef2f67d 100644
|
||||
index 26ee6e9219059c9f7175148e934d2adec2b336a0..f3e67e96bea9059aad60c896d7f376f727a5a158 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1282,9 +1282,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
@@ -1294,9 +1294,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
||||
//if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit // Paper - move down
|
||||
//MinecraftServer.LOGGER.debug("Autosave started"); // Paper
|
||||
serverAutoSave = (autosavePeriod > 0 && this.ticks % autosavePeriod == 0); // Paper
|
||||
@ -62,18 +62,18 @@ index 440c7f15e2e081ec13d6ab32177c70ef4959e8bb..6a151e60b7f203b629c55c80ac998a80
|
||||
// Paper start
|
||||
for (WorldServer world : getWorlds()) {
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 8498324704ea2e3178a46149b2cc2fd37682dbff..7ac8e538e98b027b5aea20231b2aad79f49e5cb5 100644
|
||||
index c10a1d15bcfe0cb1c2ff6ee7f2881bc2040bcd1d..1dfd274e3af26792d5da88c59c0ebc71d8b9feb4 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -468,6 +468,7 @@ public abstract class PlayerList {
|
||||
@@ -484,6 +484,7 @@ public abstract class PlayerList {
|
||||
protected void savePlayerFile(EntityPlayer entityplayer) {
|
||||
if (!entityplayer.getBukkitEntity().isPersistent()) return; // CraftBukkit
|
||||
if (!entityplayer.didPlayerJoinEvent) return; // Paper - If we never fired PJE, we disconnected during login. Data has not changed, and additionally, our saved vehicle is not loaded! If we save now, we will lose our vehicle (CraftBukkit bug)
|
||||
+ entityplayer.lastSave = MinecraftServer.currentTick; // Yatopia
|
||||
this.playerFileData.save(entityplayer);
|
||||
ServerStatisticManager serverstatisticmanager = entityplayer.getStatisticManager(); // CraftBukkit
|
||||
ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStatisticManager(); // CraftBukkit
|
||||
|
||||
@@ -1114,10 +1115,21 @@ public abstract class PlayerList {
|
||||
@@ -1130,10 +1131,21 @@ public abstract class PlayerList {
|
||||
}
|
||||
|
||||
public void savePlayers() {
|
||||
@ -86,12 +86,12 @@ index 8498324704ea2e3178a46149b2cc2fd37682dbff..7ac8e538e98b027b5aea20231b2aad79
|
||||
+ int numSaved = 0;
|
||||
+ long now = MinecraftServer.currentTick;
|
||||
for (int i = 0; i < this.players.size(); ++i) {
|
||||
- this.savePlayerFile(this.players.get(i));
|
||||
- this.savePlayerFile((EntityPlayer) this.players.get(i));
|
||||
+ EntityPlayer entityplayer = this.players.get(i);
|
||||
+ if (interval == null || now - entityplayer.lastSave >= interval) {
|
||||
+ this.savePlayerFile(entityplayer);
|
||||
+ if (interval != null && ++numSaved <= dev.tr7zw.yatopia.YatopiaConfig.maxPlayerAutoSavePerTick) { break; }
|
||||
+ }
|
||||
+ }
|
||||
+ // Yatopia end
|
||||
}
|
||||
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
||||
|
@ -1,20 +1,20 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MrIvanPlays <ivan@mrivanplays.com>
|
||||
Date: Sun, 9 Aug 2020 21:33:37 +0300
|
||||
Date: Sun, 9 Aug 2020 16:58:18 -0500
|
||||
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 988ce5aab920e0660098941e4bc89f0128cef23d..2eb59319360592145172a1cfd2395bb548c3b780 100644
|
||||
index 3782d329dc62a9e834f16a9009f4102b5b4aad6f..2a681afff2e8b9f7b7e106dcb780ecac27d14353 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -823,12 +823,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
||||
@@ -833,12 +833,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
||||
this.server.getPlayerList().sendAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.i, this.thunderLevel));
|
||||
}
|
||||
// */
|
||||
- for (int idx = 0; idx < this.players.size(); ++idx) {
|
||||
- if (this.players.get(idx).world == this) {
|
||||
- this.players.get(idx).tickWeather();
|
||||
- if (((EntityPlayer) this.players.get(idx)).world == this) {
|
||||
- ((EntityPlayer) this.players.get(idx)).tickWeather();
|
||||
+ // Yatopia start
|
||||
+ for (EntityPlayer player : players) {
|
||||
+ if (player.world == this) {
|
||||
@ -29,11 +29,11 @@ index 988ce5aab920e0660098941e4bc89f0128cef23d..2eb59319360592145172a1cfd2395bb5
|
||||
if (flag != this.isRaining()) {
|
||||
// Only send weather packets to those affected
|
||||
for (int idx = 0; idx < this.players.size(); ++idx) {
|
||||
@@ -842,6 +847,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
||||
this.players.get(idx).updateWeather(this.lastRainLevel, this.rainLevel, this.lastThunderLevel, this.thunderLevel);
|
||||
@@ -852,6 +857,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
||||
((EntityPlayer) this.players.get(idx)).updateWeather(this.lastRainLevel, this.rainLevel, this.lastThunderLevel, this.thunderLevel);
|
||||
}
|
||||
}
|
||||
+ */ // Yatopia end
|
||||
+ */ // Yatopia end
|
||||
// CraftBukkit end
|
||||
|
||||
if (this.everyoneSleeping) {
|
@ -5,7 +5,7 @@ Subject: [PATCH] Optimize BehaviorController
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BehaviorController.java b/src/main/java/net/minecraft/server/BehaviorController.java
|
||||
index ae2905b403a63396d9cdc61444586ea5548f2974..ac1deaa9e15cdd05f34b8ee413be826855432a86 100644
|
||||
index ae2905b403a63396d9cdc61444586ea5548f2974..4ad7f42158bb945088a4d1c574c63dd6c15fa53c 100644
|
||||
--- a/src/main/java/net/minecraft/server/BehaviorController.java
|
||||
+++ b/src/main/java/net/minecraft/server/BehaviorController.java
|
||||
@@ -53,13 +53,16 @@ public class BehaviorController<E extends EntityLiving> {
|
||||
@ -73,7 +73,7 @@ index ae2905b403a63396d9cdc61444586ea5548f2974..ac1deaa9e15cdd05f34b8ee413be8268
|
||||
return recordbuilder;
|
||||
}
|
||||
}).fieldOf("memories").codec());
|
||||
@@ -158,6 +155,14 @@ public class BehaviorController<E extends EntityLiving> {
|
||||
@@ -158,6 +155,15 @@ public class BehaviorController<E extends EntityLiving> {
|
||||
return ((Codec) this.b.get()).encodeStart(dynamicops, this);
|
||||
}
|
||||
|
||||
@ -85,10 +85,11 @@ index ae2905b403a63396d9cdc61444586ea5548f2974..ac1deaa9e15cdd05f34b8ee413be8268
|
||||
+ }
|
||||
+ return ret;
|
||||
+ }
|
||||
+ // Yatopia end
|
||||
private Stream<BehaviorController.a<?>> j() {
|
||||
return this.memories.entrySet().stream().map((entry) -> {
|
||||
return BehaviorController.a.b((MemoryModuleType) entry.getKey(), (Optional) entry.getValue());
|
||||
@@ -196,7 +201,7 @@ public class BehaviorController<E extends EntityLiving> {
|
||||
@@ -196,7 +202,7 @@ public class BehaviorController<E extends EntityLiving> {
|
||||
}
|
||||
|
||||
public <U> Optional<U> getMemory(MemoryModuleType<U> memorymoduletype) {
|
||||
@ -97,7 +98,7 @@ index ae2905b403a63396d9cdc61444586ea5548f2974..ac1deaa9e15cdd05f34b8ee413be8268
|
||||
}
|
||||
|
||||
public <U> boolean b(MemoryModuleType<U> memorymoduletype, U u0) {
|
||||
@@ -535,7 +540,7 @@ public class BehaviorController<E extends EntityLiving> {
|
||||
@@ -535,7 +541,7 @@ public class BehaviorController<E extends EntityLiving> {
|
||||
private final MemoryModuleType<U> a;
|
||||
private final Optional<? extends ExpirableMemory<U>> b;
|
||||
|
16154
patches/server/0033-Intellij-Optimize-Imports.patch
Normal file
16154
patches/server/0033-Intellij-Optimize-Imports.patch
Normal file
File diff suppressed because it is too large
Load Diff
32453
patches/server/0034-Intellij-Code-Clean-Up.patch
Normal file
32453
patches/server/0034-Intellij-Code-Clean-Up.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user