Few little optimisations

NachoSpigot-API/pom.xml

@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.9</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>org.avaje</groupId>
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.21.0</version>
+            <version>3.21.2</version>
         </dependency>
         <!-- Kyori api -->
         <!-- https://mvnrepository.com/artifact/net.kyori/adventure-api -->
@@ -92,7 +92,6 @@
             <artifactId>adventure-key</artifactId>
             <version>4.9.3</version>
         </dependency>
-
         <!-- testing -->
         <dependency>
             <groupId>junit</groupId>

NachoSpigot-Server/pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>it.unimi.dsi</groupId>
             <artifactId>fastutil</artifactId>
-            <version>8.5.6</version>
+            <version>8.5.8</version>
         </dependency>
         <dependency>
             <groupId>net.jafama</groupId>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>
-            <version>3.2</version>
+            <version>5.0.4</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
@@ -100,23 +100,6 @@
             <artifactId>log4j-core</artifactId>
             <version>2.17.1</version>
             <scope>compile</scope>
-        </dependency>
-	    <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.17.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.17.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-iostreams</artifactId>
-            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -169,8 +152,8 @@
             <url>https://maven.elmakers.com/repository/</url>
         </repository>
         <repository>
-            <id>velocity-repo</id>
-            <url>https://repo.velocitypowered.com/snapshots/</url>
+            <id>velocity</id>
+            <url>https://nexus.velocitypowered.com/repository/maven-public/</url>
         </repository>
     </repositories>
 
@@ -180,26 +163,26 @@
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <groupId>com.lukegb.mojo</groupId>
-                <artifactId>gitdescribe-maven-plugin</artifactId>
-                <version>1.3</version>
+                <groupId>net.md-5</groupId>
+                <artifactId>scriptus</artifactId>
+                <version>0.4</version>
                 <configuration>
                     <outputPrefix>git-NachoSpigot-</outputPrefix>
                     <scmDirectory>..</scmDirectory>
                 </configuration>
                 <executions>
                     <execution>
-                        <phase>compile</phase>
+                        <phase>initialize</phase>
                         <goals>
-                            <goal>gitdescribe</goal>
+                            <goal>describe</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.2.2</version>
                 <configuration>
                     <finalName>NachoSpigot</finalName>
                     <forceCreation>true</forceCreation> <!-- Required to prevent shading the jar multiple times -->
@@ -312,7 +295,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

NachoSpigot-Server/src/main/java/net/minecraft/server/BlockStateEnum.java

@@ -42,8 +42,7 @@ public String a(T t0) {
 
     // TacoSpigot start
     @Override
-    public int
-getValueId(T value) {
+    public int getValueId(T value) {
         return value.ordinal();
     }
 

NachoSpigot-Server/src/main/java/net/minecraft/server/DataWatcher.java

@@ -30,7 +30,7 @@ public class DataWatcher {
     // TacoSpigot end
     // Spigot End
     private boolean e;
-//    private ReadWriteLock f = new ReentrantReadWriteLock(); // Spigot - Remove DataWatcher Locking
+    //private ReadWriteLock f = new ReentrantReadWriteLock(); // Spigot - Remove DataWatcher Locking
     boolean registrationLocked; // Spigot
 
     public DataWatcher(Entity entity) {
@@ -50,9 +50,9 @@ public <T> void a(int i, T t0) {
         } else {
             DataWatcher.WatchableObject datawatcher_watchableobject = new DataWatcher.WatchableObject(integer, i, t0); // Spigot
 
-//            this.f.writeLock().lock(); // Spigot - not required
+            //this.f.writeLock().lock(); // Spigot - not required
             this.dataValues.put(i, datawatcher_watchableobject); // Spigot
-//            this.f.writeLock().unlock(); // Spigot - not required
+            //this.f.writeLock().unlock(); // Spigot - not required
             this.b = false;
         }
     }
@@ -109,8 +109,8 @@ private DataWatcher.WatchableObject j(int i) {
 
         this.f.readLock().unlock();
         return datawatcher_watchableobject;
+        */
 
-         */
         return (WatchableObject) this.dataValues.get(i);
     }
 
@@ -157,7 +157,7 @@ public List<DataWatcher.WatchableObject> b() {
         ArrayList arraylist = null;
 
         if (this.e) {
-//            this.f.readLock().lock(); // Spigot - not required
+            //this.f.readLock().lock(); // Spigot - not required
             Iterator iterator = this.dataValues.values().iterator(); // Spigot // TacoSpigot
 
             while (iterator.hasNext()) {
@@ -169,7 +169,7 @@ public List<DataWatcher.WatchableObject> b() {
                         arraylist = Lists.newArrayList();
                     }
 
-                   // Spigot start - copy ItemStacks to prevent ConcurrentModificationExceptions
+                    // Spigot start - copy ItemStacks to prevent ConcurrentModificationExceptions
                     if ( datawatcher_watchableobject.b() instanceof ItemStack )
                     {
                         datawatcher_watchableobject = new WatchableObject(
@@ -184,15 +184,15 @@ public List<DataWatcher.WatchableObject> b() {
                 }
             }
 
-//            this.f.readLock().unlock(); // Spigot - not required
+            //this.f.readLock().unlock(); // Spigot - not required
         }
 
         this.e = false;
         return arraylist;
     }
 
     public void a(PacketDataSerializer serializer) throws IOException {
-//        this.f.readLock().lock(); // Spigot - not required
+        //this.f.readLock().lock(); // Spigot - not required
         Iterator iterator = this.dataValues.values().iterator(); // Spigot // TacoSpigot
 
         while (iterator.hasNext()) {
@@ -201,14 +201,14 @@ public void a(PacketDataSerializer serializer) throws IOException {
             a(serializer, datawatcher_watchableobject);
         }
 
-//        this.f.readLock().unlock(); // Spigot - not required
+        //this.f.readLock().unlock(); // Spigot - not required
         serializer.writeByte(127);
     }
 
     public List<DataWatcher.WatchableObject> c() {
         ArrayList arraylist = Lists.newArrayList(); // Spigot
 
-//        this.f.readLock().lock(); // Spigot - not required
+        //this.f.readLock().lock(); // Spigot - not required
 
         arraylist.addAll(this.dataValues.values()); // Spigot // TacoSpigot
         // Spigot start - copy ItemStacks to prevent ConcurrentModificationExceptions
@@ -227,7 +227,7 @@ public List<DataWatcher.WatchableObject> c() {
         }
         // Spigot end
 
-//        this.f.readLock().unlock(); // Spigot - not required
+        //this.f.readLock().unlock(); // Spigot - not required
         return arraylist;
     }
 

NachoSpigot-Server/src/main/java/net/minecraft/server/EntityMinecartAbstract.java

@@ -30,9 +30,9 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
     private double derailedX = 0.5;
     private double derailedY = 0.5;
     private double derailedZ = 0.5;
-    private double flyingX = 0.95;
-    private double flyingY = 0.95;
-    private double flyingZ = 0.95;
+    private double flyingX = 0.949999988079071D; // Paper - restore vanilla precision
+    private double flyingY = 0.949999988079071D; // Paper - restore vanilla precision
+    private double flyingZ = 0.949999988079071D; // Paper - restore vanilla precision
     public double maxSpeed = 0.4D;
     // CraftBukkit end
 

NachoSpigot-Server/src/main/java/net/minecraft/server/ItemBoat.java

@@ -25,9 +25,9 @@ public ItemStack a(ItemStack itemstack, World world, EntityHuman entityhuman) {
         float f8 = f3 * f5;
         double d3 = 5.0D;
         Vec3D vec3d1 = vec3d.add((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
-        MovingObjectPosition movingobjectposition = world.rayTrace(vec3d, vec3d1, true);
+        MovingObjectPosition movingobjectpositionblock = world.rayTrace(vec3d, vec3d1, true);
 
-        if (movingobjectposition == null) {
+        if (movingobjectpositionblock == null) {
             return itemstack;
         } else {
             Vec3D vec3d2 = entityhuman.d(f);
@@ -51,23 +51,24 @@ public ItemStack a(ItemStack itemstack, World world, EntityHuman entityhuman) {
             if (flag) {
                 return itemstack;
             } else {
-                if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK) {
-                    BlockPosition blockposition = movingobjectposition.a();
+                if (movingobjectpositionblock.type == MovingObjectPosition.EnumMovingObjectType.BLOCK) {
 
+                    BlockPosition blockposition = movingobjectpositionblock.a();
+                    /* Paper - Remove unneeded interaction event trigger
                     // CraftBukkit start - Boat placement
                     org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(entityhuman, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, blockposition, movingobjectposition.direction, itemstack);
 
                     if (event.isCancelled()) {
                         return itemstack;
                     }
                     // CraftBukkit end
+                    */ // Paper - Remove unneeded interaction event trigger
 
                     if (world.getType(blockposition).getBlock() == Blocks.SNOW_LAYER) {
                         blockposition = blockposition.down();
                     }
 
                     EntityBoat entityboat = new EntityBoat(world, (double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 1.0F), (double) ((float) blockposition.getZ() + 0.5F));
-
                     entityboat.yaw = (float) (((MathHelper.floor((double) (entityhuman.yaw * 4.0F / 360.0F) + 0.5D) & 3) - 1) * 90);
                     if (!world.getCubes(entityboat, entityboat.getBoundingBox().grow(-0.1D, -0.1D, -0.1D)).isEmpty()) {
                         return itemstack;

NachoSpigot-Server/src/main/java/net/minecraft/server/MinecraftServer.java

@@ -808,9 +808,10 @@ public void B() {
 
         SpigotTimings.timeUpdateTimer.startTiming(); // Spigot
         // Send time updates to everyone, it will get the right time from the world the player is in.
-        // Paper start - optimize time updates
         int i;
 
+        // Paper start - optimize time updates
+        /*
         if ((this.ticks % 20) == 0)
         {
             for (i = 0; i < this.worlds.size(); ++i) {
@@ -834,7 +835,26 @@ public void B() {
                     }
                 }
             }
+        } */
+        for (i = 0; i < this.worlds.size(); ++i) { // Nacho
+            final WorldServer world = this.worlds.get(i); // Nacho
+            final boolean doDaylight = world.getGameRules().getBoolean("doDaylightCycle");
+            final long dayTime = world.getDayTime();
+            long worldTime = world.getTime();
+            final PacketPlayOutUpdateTime worldPacket = new PacketPlayOutUpdateTime(worldTime, dayTime, doDaylight);
+            for (EntityHuman entityhuman : world.players) {
+                if (!(entityhuman instanceof EntityPlayer) || (ticks + entityhuman.getId()) % 20 != 0) {
+                    continue;
+                }
+                EntityPlayer entityplayer = (EntityPlayer) entityhuman;
+                long playerTime = entityplayer.getPlayerTime();
+                PacketPlayOutUpdateTime packet = (playerTime == dayTime) ? worldPacket :
+                    new PacketPlayOutUpdateTime(worldTime, playerTime, doDaylight);
+                entityplayer.playerConnection.sendPacket(packet); // Add support for per player time
+            }
         }
+        // Paper end
+
         SpigotTimings.timeUpdateTimer.stopTiming(); // Spigot
 
         for (i = 0; i < this.worlds.size(); ++i) {

NachoSpigot-Server/src/main/java/net/minecraft/server/PlayerConnection.java

@@ -2074,7 +2074,7 @@ public void a(PacketPlayInUpdateSign packetplayinupdatesign) {
 
             TileEntitySign tileentitysign = (TileEntitySign) tileentity;
 
-            if (!tileentitysign.b() || tileentitysign.c() != this.player) {
+            if (!tileentitysign.b() || tileentitysign.signEditor == null || !tileentitysign.signEditor.equals(this.player.getUniqueID())) { // Paper
                 this.minecraftServer.warning("Player " + this.player.getName() + " just tried to change non-editable sign");
                 this.sendPacket(new PacketPlayOutUpdateSign(tileentity.world, packetplayinupdatesign.a(), tileentitysign.lines)); // CraftBukkit
                 return;

NachoSpigot-Server/src/main/java/net/minecraft/server/TileEntityHopper.java

@@ -569,7 +569,7 @@ private static ItemStack c(IInventory iinventory, ItemStack itemstack, int i, En
                         tileentityhopper.d(tileentityhopper.world.spigotConfig.hopperTransfer); // Spigot
                     }
 
-//                    iinventory.update(); // Paper
+                    //iinventory.update(); // Paper
                 }
 
                 iinventory.update();

NachoSpigot-Server/src/main/java/net/minecraft/server/TileEntitySign.java

@@ -9,6 +9,7 @@ public class TileEntitySign extends TileEntity {
     public boolean isEditable = true;
     private EntityHuman h;
     private final CommandObjectiveExecutor i = new CommandObjectiveExecutor();
+    public java.util.UUID signEditor;
 
     public TileEntitySign() {}
 
@@ -121,7 +122,10 @@ public boolean b() {
     }
 
     public void a(EntityHuman entityhuman) {
-        this.h = entityhuman;
+        // Paper start
+        //this.h = entityhuman;
+        signEditor = entityhuman != null ? entityhuman.getUniqueID() : null;
+        // Paper end
     }
 
     public EntityHuman c() {

NachoSpigot-Server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java

@@ -25,15 +25,15 @@ public class CraftBlockState implements BlockState {
     protected int type;
     protected MaterialData data;
     protected int flag;
-    protected final byte light;
+    //protected final byte light; // CraftBukkit - SPIGOT-2286
 
     public CraftBlockState(final Block block) {
         this.world = (CraftWorld) block.getWorld();
         this.x = block.getX();
         this.y = block.getY();
         this.z = block.getZ();
         this.type = block.getTypeId();
-        this.light = block.getLightLevel();
+        //this.light = block.getLightLevel(); // CraftBukkit - SPIGOT-2286
         this.chunk = (CraftChunk) block.getChunk();
         this.flag = 3;
 
@@ -48,7 +48,7 @@ public CraftBlockState(final Block block, int flag) {
     public CraftBlockState(Material material) {
         world = null;
         type = material.getId();
-        light = 0;
+        // light = 0; // CraftBukkit - SPIGOT-2286
         chunk = null;
         x = y = z = 0;
     }
@@ -132,7 +132,8 @@ public int getTypeId() {
     }
 
     public byte getLightLevel() {
-        return light;
+        //return light; // CraftBukkit - SPIGOT-2286
+        return getBlock().getLightLevel(); // CraftBukkit - SPIGOT-2286
     }
 
     public Block getBlock() {