Skip to content

Commit da54730

Browse files
ScribbleScribble
authored andcommitted
Fix crash in Minecraft Server
-Thanks Kynatosh -Reformatted the file a bit...
1 parent f12cfa8 commit da54730

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

src/main/java/de/scribble/lp/tasmod/mixin/MixinMinecraftServer.java

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public long modifyMSPT(long fiftyLong) {
3737
@Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;tick()V", ordinal = 1))
3838
public void redirectTick(MinecraftServer server) {
3939
this.tick();
40-
if (SavestateHandler.state==SavestateState.WASLOADING) {
40+
if (SavestateHandler.state == SavestateState.WASLOADING) {
4141
SavestateHandler.state = SavestateState.NONE;
4242
SavestateHandler.playerLoadSavestateEventServer();
4343
}
@@ -77,11 +77,11 @@ public long redirectMathMax(long oneLong, long i) {
7777

7878
@Shadow
7979
private Queue<FutureTask<?>> futureTaskQueue;
80-
80+
8181
@Shadow
8282
private NetworkSystem networkSystem;
83-
84-
private int faketick=0;
83+
84+
private int faketick = 0;
8585

8686
@Redirect(method = "run", at = @At(value = "INVOKE", target = "Ljava/lang/Thread;sleep(J)V"))
8787
public void redirectThreadSleep(long msToTick) {
@@ -93,13 +93,15 @@ public void redirectThreadSleep(long msToTick) {
9393
msToTick = 1L;
9494
}
9595
for (long o = 0; o < msToTick; o++) {
96-
if(TickrateChangerServer.TICKS_PER_SECOND==0) {
97-
currentTime=System.currentTimeMillis();
96+
if (TickrateChangerServer.TICKS_PER_SECOND == 0) {
97+
currentTime = System.currentTimeMillis();
9898
faketick++;
99-
if(faketick>=20) {
100-
faketick=0;
99+
if (faketick >= 20) {
100+
faketick = 0;
101101
networkSystem.networkTick();
102-
runPendingCommands();
102+
if (((MinecraftServer) (Object) this).isDedicatedServer()) {
103+
runPendingCommands();
104+
}
103105
}
104106
}
105107
if (TickrateChangerServer.INTERRUPT) {
@@ -116,7 +118,7 @@ public void redirectThreadSleep(long msToTick) {
116118
}
117119
}
118120
}
119-
121+
120122
try {
121123
Thread.sleep(1L);
122124
} catch (InterruptedException e) {
@@ -128,14 +130,14 @@ public void redirectThreadSleep(long msToTick) {
128130

129131
@SideOnly(Side.SERVER)
130132
private void runPendingCommands() {
131-
if((MinecraftServer)(Object)this instanceof net.minecraft.server.dedicated.DedicatedServer) {
132-
net.minecraft.server.dedicated.DedicatedServer server=(net.minecraft.server.dedicated.DedicatedServer)(MinecraftServer)(Object)this;
133+
if ((MinecraftServer) (Object) this instanceof net.minecraft.server.dedicated.DedicatedServer) {
134+
net.minecraft.server.dedicated.DedicatedServer server = (net.minecraft.server.dedicated.DedicatedServer) (MinecraftServer) (Object) this;
133135
server.executePendingCommands();
134136
}
135137
}
136138

137139
// =====================================================================================================================================
138-
140+
139141
// @Inject(method = "tick", at = @At("HEAD"))
140142
// public void lagServer(CallbackInfo ci) {
141143
// if(SavestateEvents.lagServer) {
@@ -147,13 +149,13 @@ private void runPendingCommands() {
147149
// }
148150
// }
149151
// }
150-
152+
151153
// @ModifyVariable(method = "run", at = @At(value = "STORE"), index = 5, ordinal = 2)
152154
// public long limitLag(long j) {
153155
// if(j>(500L*(20/TickrateChangerServer.TICKS_PER_SECOND))){
154156
// return 50L;
155157
// }
156158
// return j;
157159
// }
158-
160+
159161
}

0 commit comments

Comments
 (0)