mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-16 18:31:53 +01:00
Update CraftBukkit
This commit is contained in:
parent
f2a1235de0
commit
7a921fe094
27 changed files with 2 additions and 22 deletions
CraftBukkit
CraftBukkit-Patches
0146-Cross-World-Entity-Teleportation.patch0146-Fix-ItemFrame-and-Fireball-EntityDamageByEntityEvent.patch0147-Limit-block-placement-interaction-packets.patch0148-Better-item-validation.patch0149-Further-Seed-Customisation.patch0150-Disable-ResourceLeakDetector.patch0151-Add-More-Information-to-session.lock-Errors.patch0152-Safer-JSON-Loading.patch0153-Fix-Slow-Loading-Libraries.patch0154-Add-CommandLine-EULA-Flag.patch0155-Fix-misnamed-function-from-1.7.10-update.patch0156-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch0157-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch0158-Prevent-a-crash-involving-attributes.patch0159-Fix-IP-banning.patch0160-Make-moved-wrongly-limit-configurable.patch0161-Fix-Null-Tile-Entity-Worlds.patch0162-Make-moved-too-quickly-limit-configurable.patch0163-Log-debug-levels-to-the-log-file.patch0164-Alternative-Hopper-Ticking.patch0165-Apply-NBTReadLimiter-to-more-things.patch0166-Allow-Attribute-Capping.patch0167-Add-an-option-for-a-global-cache-for-any-request-on-.patch0168-Only-fetch-an-online-UUID-in-online-mode.patch0169-Filter-attribute-modifiers-which-cause-the-attribute.patch0170-Fix-missed-diff-from-Minecraft-1.3.1-update.patch
|
@ -1 +1 @@
|
|||
Subproject commit 37c79691615fbd28b49c7371a64700e4f5713eca
|
||||
Subproject commit a04b586418538c428d0e464df3e2a1f3b06889fd
|
|
@ -1,20 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
|
||||
Date: Tue, 24 Jun 2014 09:51:05 -0500
|
||||
Subject: [PATCH] Fix ItemFrame and Fireball EntityDamageByEntityEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -0,0 +0,0 @@ public class CraftEventFactory {
|
||||
if (event == null) {
|
||||
return false;
|
||||
}
|
||||
- return event.isCancelled() || event.getDamage() == 0;
|
||||
+ return event.isCancelled();
|
||||
}
|
||||
|
||||
public static PlayerLevelChangeEvent callPlayerLevelChangeEvent(Player player, int oldLevel, int newLevel) {
|
||||
--
|
|
@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
@@ -0,0 +0,0 @@ public class PlayerChunkMap {
|
||||
this.a(pair.x, pair.z, true).a(entityplayer);
|
||||
}
|
||||
|
||||
|
||||
- if (i1 > 1 || i1 < -1 || j1 > 1 || j1 < -1) {
|
||||
+ if (j1 > 1 || j1 < -1 || k1 > 1 || k1 < -1) { // Spigot - missed diff
|
||||
Collections.sort(entityplayer.chunkCoordIntPairQueue, new ChunkCoordComparator(entityplayer));
|
Loading…
Add table
Reference in a new issue