Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix a NPE and packet compat

Browse Source
This commit is contained in:
Sotr
2018-09-02 15:56:10 +08:00
parent f73c20e342
commit 5fe93610c9
5 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
sources/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java → removed/com/destroystokyo/paper/antixray/DataBitsReader.java
View File

0
sources/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java → removed/com/destroystokyo/paper/antixray/DataBitsWriter.java
View File

0
sources/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java → removed/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java
View File

0
sources/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java → removed/net/minecraft/server/PacketPlayOutMapChunk.java
View File

3
sources/src/main/java/net/minecraft/server/Entity.java
View File

@@ -27,6 +27,7 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Vehicle; import org.bukkit.entity.Vehicle;
import co.aikar.timings.MinecraftTimings; // Paper import co.aikar.timings.MinecraftTimings; // Paper
import co.aikar.timings.Timing; // Paper import co.aikar.timings.Timing; // Paper
import io.akarin.api.internal.Akari;
import io.akarin.api.internal.mixin.IMixinWorldServer; import io.akarin.api.internal.mixin.IMixinWorldServer;
import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.entity.EntityCombustByEntityEvent;
@@ -210,7 +211,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
this.length = 1.8F; this.length = 1.8F;
this.ax = 1; this.ax = 1;
this.ay = 1.0F; this.ay = 1.0F;
this.random = ((IMixinWorldServer) world).rand(); // Paper // Akarin this.random = world == null ? SHARED_RANDOM : ((IMixinWorldServer) world).rand(); // Paper // Akarin
this.fireTicks = -this.getMaxFireTicks(); this.fireTicks = -this.getMaxFireTicks();
this.justCreated = true; this.justCreated = true;
this.uniqueID = MathHelper.a(this.random); this.uniqueID = MathHelper.a(this.random);