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

Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
d58803c2 SPIGOT-4597: Make BlockDropItemEvent use a list
d450fdf1 Add note about Maven repository usage to pom.xml

CraftBukkit Changes:
ed274c51 SPIGOT-4597: Make BlockDropItemEvent use a list
1734f378 SPIGOT-4598: Shift click on custom workbench inventory causes crash
a65b73ad Add note about Maven repository usage to pom.xml
This commit is contained in:
Shane Freeder
2019-01-30 13:26:12 +00:00
parent e3f2448ae1
commit e87859d8a5
22 changed files with 123 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Spigot-Server-Patches/0366-Async-Chunk-Loading-and-Generation.patch
View File

@@ -1,4 +1,4 @@
From 31e7140454df9477e1b83041498f33dde76e2650 Mon Sep 17 00:00:00 2001
From 17e3cdb6f3d0d395f60b6c8fa92dab6a703f1b36 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 16:55:04 -0400
Subject: [PATCH] Async Chunk Loading and Generation
@@ -2381,10 +2381,10 @@ index 95fe3a91bf..b5a87cfaf6 100644
if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) {
unloadChunk(chunkCoordX + x, chunkCoordZ + z);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 58ebecefe0..282b4e6c38 100644
index 054ebc82bd..2e0b4de83b 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -81,6 +81,7 @@ public class CraftEventFactory {
@@ -82,6 +82,7 @@ public class CraftEventFactory {
public static final DamageSource POISON = CraftDamageSource.copyOf(DamageSource.MAGIC);
public static org.bukkit.block.Block blockDamage; // For use in EntityDamageByBlockEvent
public static Entity entityDamage; // For use in EntityDamageByEntityEvent
@@ -2392,7 +2392,7 @@ index 58ebecefe0..282b4e6c38 100644
// helper methods
private static boolean canBuild(CraftWorld world, Player player, int x, int z) {
@@ -469,6 +470,7 @@ public class CraftEventFactory {
@@ -474,6 +475,7 @@ public class CraftEventFactory {
CraftServer craftServer = (CraftServer) entity.getServer();
CreatureSpawnEvent event = new CreatureSpawnEvent(entity, spawnReason);
@@ -2400,7 +2400,7 @@ index 58ebecefe0..282b4e6c38 100644
craftServer.getPluginManager().callEvent(event);
return event;
}
@@ -1123,6 +1125,7 @@ public class CraftEventFactory {
@@ -1128,6 +1130,7 @@ public class CraftEventFactory {
}
BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(block.getX(), block.getY(), block.getZ()), cause, igniter);
@@ -2408,7 +2408,7 @@ index 58ebecefe0..282b4e6c38 100644
world.getServer().getPluginManager().callEvent(event);
return event;
}
@@ -1147,6 +1150,7 @@ public class CraftEventFactory {
@@ -1152,6 +1155,7 @@ public class CraftEventFactory {
}
BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()), cause, bukkitIgniter);
@@ -2416,7 +2416,7 @@ index 58ebecefe0..282b4e6c38 100644
world.getServer().getPluginManager().callEvent(event);
return event;
}
@@ -1354,7 +1358,8 @@ public class CraftEventFactory {
@@ -1359,7 +1363,8 @@ public class CraftEventFactory {
public static BlockPhysicsEvent callBlockPhysicsEvent(GeneratorAccess world, BlockPosition blockposition) {
org.bukkit.block.Block block = CraftBlock.at(world, blockposition);
BlockPhysicsEvent event = new BlockPhysicsEvent(block, block.getBlockData());
@@ -2426,7 +2426,7 @@ index 58ebecefe0..282b4e6c38 100644
return event;
}
@@ -1390,6 +1395,7 @@ public class CraftEventFactory {
@@ -1395,6 +1400,7 @@ public class CraftEventFactory {
}
EntityPotionEffectEvent event = new EntityPotionEffectEvent((LivingEntity) entity.getBukkitEntity(), bukkitOldEffect, bukkitNewEffect, cause, action, willOverride);
@@ -2434,7 +2434,7 @@ index 58ebecefe0..282b4e6c38 100644
Bukkit.getPluginManager().callEvent(event);
return event;
@@ -1408,6 +1414,7 @@ public class CraftEventFactory {
@@ -1413,6 +1419,7 @@ public class CraftEventFactory {
blockState.setData(block);
BlockFormEvent event = (entity == null) ? new BlockFormEvent(blockState.getBlock(), blockState) : new EntityBlockFormEvent(entity.getBukkitEntity(), blockState.getBlock(), blockState);