diff --git a/Patches/Bukkit-Patches/0001-Update-groupId.patch b/Patches/Bukkit-Patches/0001-Update-groupId.patch index f767a0d97..65969d468 100644 --- a/Patches/Bukkit-Patches/0001-Update-groupId.patch +++ b/Patches/Bukkit-Patches/0001-Update-groupId.patch @@ -1,4 +1,4 @@ -From b3604650ac6e2813f9e1b4d54862ce79c37e001e Mon Sep 17 00:00:00 2001 +From b3c9291331205afc5b78e85435b5daa099813a1b Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 15 Feb 2016 09:39:33 +1100 Subject: [PATCH] Update groupId @@ -18,5 +18,5 @@ index cb142f2..378fd01 100644 1.8.8-R0.1-SNAPSHOT jar -- -2.5.0 +2.7.4 diff --git a/Patches/Bukkit-Patches/0002-LivingEntity-changes.patch b/Patches/Bukkit-Patches/0002-LivingEntity-changes.patch index c859889b2..562b634f5 100644 --- a/Patches/Bukkit-Patches/0002-LivingEntity-changes.patch +++ b/Patches/Bukkit-Patches/0002-LivingEntity-changes.patch @@ -1,4 +1,4 @@ -From 41b16c2e04b2bc8ada5d0ed363e4ea5e6b466ee1 Mon Sep 17 00:00:00 2001 +From ad41271f22ea5f75476451b2c23f3ab0e54e2a6d Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 23 Oct 2015 21:23:18 +1300 Subject: [PATCH] LivingEntity changes @@ -30,5 +30,5 @@ index 48e2508..fb623ae 100644 + public void setGhost(boolean ghost); } -- -2.5.0 +2.7.4 diff --git a/Patches/Bukkit-Patches/0003-EntityDismountEvent.patch b/Patches/Bukkit-Patches/0003-EntityDismountEvent.patch index 3acb7e51a..33e37c954 100644 --- a/Patches/Bukkit-Patches/0003-EntityDismountEvent.patch +++ b/Patches/Bukkit-Patches/0003-EntityDismountEvent.patch @@ -1,4 +1,4 @@ -From 1bb1629f460d9c8ababad25722bebd0fedf2b269 Mon Sep 17 00:00:00 2001 +From d3dc42fb5ba3a934b78f0ced14011facb075887d Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 22 Nov 2015 14:37:11 +1300 Subject: [PATCH] EntityDismountEvent @@ -43,5 +43,5 @@ index 24d4942..02943d6 100644 + } -- -2.5.0 +2.7.4 diff --git a/Patches/Bukkit-Patches/0032-Add-Elytra.patch b/Patches/Bukkit-Patches/0004-Add-Elytra.patch similarity index 87% rename from Patches/Bukkit-Patches/0032-Add-Elytra.patch rename to Patches/Bukkit-Patches/0004-Add-Elytra.patch index 5334a8345..2177de080 100644 --- a/Patches/Bukkit-Patches/0032-Add-Elytra.patch +++ b/Patches/Bukkit-Patches/0004-Add-Elytra.patch @@ -1,4 +1,4 @@ -From 32269ec951791791fe8553f0939c6eaa2b6b472b Mon Sep 17 00:00:00 2001 +From 0c6ede1fb4e6dbaac8d8acf4fa72aa28ca6d9dc7 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 30 Dec 2015 19:57:10 +1300 Subject: [PATCH] Add Elytra @@ -17,5 +17,5 @@ index 0fb2605..bc930d1 100644 GREEN_RECORD(2257, 1), RECORD_3(2258, 1), -- -1.9.5.msysgit.0 +2.7.4 diff --git a/Patches/Bukkit-Patches/0033-Levitation-potion-effect.patch b/Patches/Bukkit-Patches/0005-Levitation-potion-effect.patch similarity index 95% rename from Patches/Bukkit-Patches/0033-Levitation-potion-effect.patch rename to Patches/Bukkit-Patches/0005-Levitation-potion-effect.patch index d30465337..c8da4bb77 100644 --- a/Patches/Bukkit-Patches/0033-Levitation-potion-effect.patch +++ b/Patches/Bukkit-Patches/0005-Levitation-potion-effect.patch @@ -1,4 +1,4 @@ -From 24a5d0cfe1d62e2ff6a3a0a279c63b038a134629 Mon Sep 17 00:00:00 2001 +From a465cb15a5aea5c5f70957d5af0fe6b55108bff7 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 30 Dec 2015 21:05:47 +1300 Subject: [PATCH] Levitation potion effect @@ -42,5 +42,5 @@ index 6ad9a91..a3dc228 100644 private final int damageValue, maxLevel; -- -1.9.5.msysgit.0 +2.7.4 diff --git a/Patches/Bukkit-Patches/0006-Update-pom-version.patch b/Patches/Bukkit-Patches/0006-Update-pom-version.patch new file mode 100644 index 000000000..e9726d137 --- /dev/null +++ b/Patches/Bukkit-Patches/0006-Update-pom-version.patch @@ -0,0 +1,22 @@ +From c8afa4514a06be8257d3a05e0d261d4051a4dad0 Mon Sep 17 00:00:00 2001 +From: md_5 +Date: Mon, 25 Apr 2016 10:32:40 +1000 +Subject: [PATCH] Update pom version + + +diff --git a/pom.xml b/pom.xml +index 378fd01..13a555d 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -11,7 +11,7 @@ + + com.mineplex + spigot-api +- 1.8.8-R0.1-SNAPSHOT ++ 1.8.8-1.9-SNAPSHOT + jar + + Spigot-API +-- +2.7.4 + diff --git a/Patches/CraftBukkit-Patches/0001-Update-groupId.patch b/Patches/CraftBukkit-Patches/0001-Update-groupId.patch index 5a96169f0..2d36fec94 100644 --- a/Patches/CraftBukkit-Patches/0001-Update-groupId.patch +++ b/Patches/CraftBukkit-Patches/0001-Update-groupId.patch @@ -1,4 +1,4 @@ -From 409122f500f205b8a9b0fdec56900d83cee9f1ba Mon Sep 17 00:00:00 2001 +From 4c5177323b3556b7c6616ddd5bfa854a0b1b7e3c Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 15 Feb 2016 09:56:14 +1100 Subject: [PATCH] Update groupId @@ -27,5 +27,5 @@ index 91627ff..c1d1fb7 100644 ${project.version} jar -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0002-Modify-packets-to-public.patch b/Patches/CraftBukkit-Patches/0002-Modify-packets-to-public.patch index 26caaf86b..1af03918a 100644 --- a/Patches/CraftBukkit-Patches/0002-Modify-packets-to-public.patch +++ b/Patches/CraftBukkit-Patches/0002-Modify-packets-to-public.patch @@ -1,4 +1,4 @@ -From 687c7ed26e1733b8ed688243cd6df91c45db148a Mon Sep 17 00:00:00 2001 +From 2f928d1889df46e390373df141f75a07b267cb33 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 23 Oct 2015 21:14:50 +1300 Subject: [PATCH] Modify packets to public @@ -2033,5 +2033,5 @@ index 0000000..4c2705b +} \ No newline at end of file -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0003-Modifiy-entity.patch b/Patches/CraftBukkit-Patches/0003-Modifiy-entity.patch index dfb641d99..ccf96116a 100644 --- a/Patches/CraftBukkit-Patches/0003-Modifiy-entity.patch +++ b/Patches/CraftBukkit-Patches/0003-Modifiy-entity.patch @@ -1,4 +1,4 @@ -From ca990c7ca61006f0933d0e117f1003822b887667 Mon Sep 17 00:00:00 2001 +From 90e32385d69e8936969ac3e7e7b2cd52f2d19e28 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 23 Oct 2015 21:16:07 +1300 Subject: [PATCH] Modifiy entity @@ -800,5 +800,5 @@ index 5317cff..60e8584 100644 return Math.min(Math.max(0, getHandle().getHealth()), getMaxHealth()); } -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0004-Chunk-changes.patch b/Patches/CraftBukkit-Patches/0004-Chunk-changes.patch index 84166192b..388c692e6 100644 --- a/Patches/CraftBukkit-Patches/0004-Chunk-changes.patch +++ b/Patches/CraftBukkit-Patches/0004-Chunk-changes.patch @@ -1,4 +1,4 @@ -From c8c2e86ef3ac3baf774afacf5fe2fab0b39a39a6 Mon Sep 17 00:00:00 2001 +From 72e734acdc1912563f5d8e4a906579e3ab65064b Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 23 Oct 2015 21:21:32 +1300 Subject: [PATCH] Chunk changes @@ -231,5 +231,5 @@ index 975d666..a55bd6c 100644 /* * If it's a new world, the first few chunks are generated inside -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0005-Packet-listener-changes.patch b/Patches/CraftBukkit-Patches/0005-Packet-listener-changes.patch index ac582299e..ce321dfe1 100644 --- a/Patches/CraftBukkit-Patches/0005-Packet-listener-changes.patch +++ b/Patches/CraftBukkit-Patches/0005-Packet-listener-changes.patch @@ -1,4 +1,4 @@ -From 04418c14f74d251cebe99e4bc6315d619b0a4440 Mon Sep 17 00:00:00 2001 +From 1da9bcc60b080e3b068aff9202dbe7823d1abe64 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 23 Oct 2015 21:22:05 +1300 Subject: [PATCH] Packet listener changes @@ -349,5 +349,5 @@ index 5740e49..5edef3e 100644 public void a(PacketPlayInWindowClick packetplayinwindowclick) { -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0006-Inventory-changes.patch b/Patches/CraftBukkit-Patches/0006-Inventory-changes.patch index 66ff83ba8..8c3762b98 100644 --- a/Patches/CraftBukkit-Patches/0006-Inventory-changes.patch +++ b/Patches/CraftBukkit-Patches/0006-Inventory-changes.patch @@ -1,4 +1,4 @@ -From 413c649570b54e6d7a50da7aa888cfb20018f523 Mon Sep 17 00:00:00 2001 +From bf6cbe47c5b1ab50e4ceb7a98b25975b90ae92c2 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 23 Oct 2015 21:22:36 +1300 Subject: [PATCH] Inventory changes @@ -66,5 +66,5 @@ index 23f05f4..fdaf026 100644 public int getTypeId() { return handle != null ? CraftMagicNumbers.getId(handle.getItem()) : 0; -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0007-Misc-changes.patch b/Patches/CraftBukkit-Patches/0007-Misc-changes.patch index b122a625f..05abbdf50 100644 --- a/Patches/CraftBukkit-Patches/0007-Misc-changes.patch +++ b/Patches/CraftBukkit-Patches/0007-Misc-changes.patch @@ -1,4 +1,4 @@ -From 7772a2a9b83ee223c01ac2003ba32a1b95a7c0cd Mon Sep 17 00:00:00 2001 +From ed2a06418ba178cb6ff227ef1aca14f7b5f951df Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 23 Oct 2015 21:23:00 +1300 Subject: [PATCH] Misc changes @@ -273,5 +273,5 @@ index 29082aa..e979f69 100644 } -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0008-EntityGuardian-is-now-vegetateable.patch b/Patches/CraftBukkit-Patches/0008-EntityGuardian-is-now-vegetateable.patch index 3be012487..ed8c2856b 100644 --- a/Patches/CraftBukkit-Patches/0008-EntityGuardian-is-now-vegetateable.patch +++ b/Patches/CraftBukkit-Patches/0008-EntityGuardian-is-now-vegetateable.patch @@ -1,4 +1,4 @@ -From 969a70f201e6eda7d990e11e292e0dacc35f8ddf Mon Sep 17 00:00:00 2001 +From 562c6e8165bebbabc22f7f1d472e1fc0bf54dc86 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 28 Oct 2015 09:00:24 +1300 Subject: [PATCH] EntityGuardian is now vegetateable @@ -601,5 +601,5 @@ index 0000000..c14caf2 + public PathfinderGoalRandomStroll goalRandomStroll; +} -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0009-Controller-look-vegetateHead-Entity-collide-changes.patch b/Patches/CraftBukkit-Patches/0009-Controller-look-vegetateHead-Entity-collide-changes.patch index 9b3e7ea07..ce4214f4f 100644 --- a/Patches/CraftBukkit-Patches/0009-Controller-look-vegetateHead-Entity-collide-changes.patch +++ b/Patches/CraftBukkit-Patches/0009-Controller-look-vegetateHead-Entity-collide-changes.patch @@ -1,4 +1,4 @@ -From a48503259a76ca5b9fec3bd7ec06e0e5c1d3f8e1 Mon Sep 17 00:00:00 2001 +From 5455de50dc5b6fe4ea5ba5b98b0f9169705a0e65 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 30 Oct 2015 20:02:58 +1300 Subject: [PATCH] Controller look vegetateHead, Entity collide changes @@ -39,5 +39,5 @@ index cb9ba53..8660762 100644 double d0 = entity.locX - this.locX; double d1 = entity.locZ - this.locZ; -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0010-Vegetate-head-ai.patch b/Patches/CraftBukkit-Patches/0010-Vegetate-head-ai.patch index 47abce5ae..8fbc3cc0e 100644 --- a/Patches/CraftBukkit-Patches/0010-Vegetate-head-ai.patch +++ b/Patches/CraftBukkit-Patches/0010-Vegetate-head-ai.patch @@ -1,4 +1,4 @@ -From bafc21b97584c9207f29804520942285752d6b53 Mon Sep 17 00:00:00 2001 +From 9f6ec15bfe47f1860d878212035f477b5b253c63 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Tue, 3 Nov 2015 21:21:02 +1300 Subject: [PATCH] Vegetate head ai @@ -135,5 +135,5 @@ index f75b0b1..e384c2c 100644 } else if (!this.bM()) { this.motX *= 0.98D; -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0011-Modifications-to-cb.patch b/Patches/CraftBukkit-Patches/0011-Modifications-to-cb.patch index d2b605177..b4d7a6f68 100644 --- a/Patches/CraftBukkit-Patches/0011-Modifications-to-cb.patch +++ b/Patches/CraftBukkit-Patches/0011-Modifications-to-cb.patch @@ -1,4 +1,4 @@ -From 5e1591dec2adb9001c9c3aafd0908d95eadff484 Mon Sep 17 00:00:00 2001 +From a50aa59123b6a4b164fe368c83dbdd426dba0f6e Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 8 Nov 2015 17:57:05 +1300 Subject: [PATCH] Modifications to cb @@ -1614,5 +1614,5 @@ index 0000000..fdf0e10 + } +} -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0012-Add-IEntitySelector-have-isGhost-return-the-same-as-.patch b/Patches/CraftBukkit-Patches/0012-Add-IEntitySelector-have-isGhost-return-the-same-as-.patch index f205717f5..956841a51 100644 --- a/Patches/CraftBukkit-Patches/0012-Add-IEntitySelector-have-isGhost-return-the-same-as-.patch +++ b/Patches/CraftBukkit-Patches/0012-Add-IEntitySelector-have-isGhost-return-the-same-as-.patch @@ -1,4 +1,4 @@ -From d57744e41ed408a6f924665509bb03fac0590cfa Mon Sep 17 00:00:00 2001 +From 9d2015fe106bc67d93ea1d9a80d057f1bfad0fd0 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Mon, 9 Nov 2015 00:07:26 +1300 Subject: [PATCH] Add IEntitySelector, have isGhost() return the same as @@ -115,5 +115,5 @@ index 0000000..1536600 + +} -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0013-Add-player-spectator.patch b/Patches/CraftBukkit-Patches/0013-Add-player-spectator.patch index cd7fa9b6a..ea17edafc 100644 --- a/Patches/CraftBukkit-Patches/0013-Add-player-spectator.patch +++ b/Patches/CraftBukkit-Patches/0013-Add-player-spectator.patch @@ -1,4 +1,4 @@ -From c6967f167cb74718389c7d87a0e4847d2824e855 Mon Sep 17 00:00:00 2001 +From 436b55243d79c6ae0d839a2666a2f43ed186fe70 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Mon, 9 Nov 2015 00:13:21 +1300 Subject: [PATCH] Add player spectator @@ -18,5 +18,5 @@ index 1536600..f86cf48 100644 public boolean apply(Object obj) -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0014-Fixed-ai-typo.patch b/Patches/CraftBukkit-Patches/0014-Fixed-ai-typo.patch index ed9bbd6a7..9138d9a62 100644 --- a/Patches/CraftBukkit-Patches/0014-Fixed-ai-typo.patch +++ b/Patches/CraftBukkit-Patches/0014-Fixed-ai-typo.patch @@ -1,4 +1,4 @@ -From 9eb0754b8eaed3dd60355206dd53c6b4dacab361 Mon Sep 17 00:00:00 2001 +From b1e36dc87d3c5623283c9f461807a65d40538be3 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Mon, 9 Nov 2015 02:41:31 +1300 Subject: [PATCH] Fixed ai typo @@ -18,5 +18,5 @@ index f86cf48..b4d70ad 100644 public boolean apply(Object obj) -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0015-Fix-casting-bug.patch b/Patches/CraftBukkit-Patches/0015-Fix-casting-bug.patch index 6e2da8f3f..00a2813f4 100644 --- a/Patches/CraftBukkit-Patches/0015-Fix-casting-bug.patch +++ b/Patches/CraftBukkit-Patches/0015-Fix-casting-bug.patch @@ -1,4 +1,4 @@ -From d37159de8e6c19ed8e232666661572cc399dc82a Mon Sep 17 00:00:00 2001 +From 838463c93cd7f0b29814507cab9e7c3465e75bbb Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 11 Nov 2015 00:21:54 +1300 Subject: [PATCH] Fix casting bug @@ -60,5 +60,5 @@ index 60e8584..746961e 100644 public boolean isGhost() -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0016-Fix-schedulers.patch b/Patches/CraftBukkit-Patches/0016-Fix-schedulers.patch index b555316ac..cc1d03186 100644 --- a/Patches/CraftBukkit-Patches/0016-Fix-schedulers.patch +++ b/Patches/CraftBukkit-Patches/0016-Fix-schedulers.patch @@ -1,4 +1,4 @@ -From c881d98fee52e719e60a5c8f5eeb9497357dd597 Mon Sep 17 00:00:00 2001 +From e1d672bf80a66283809f25f925121487cc02e040 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 11 Nov 2015 11:43:17 +1300 Subject: [PATCH] Fix schedulers @@ -33,5 +33,5 @@ index 1d29ae7..55e2afd 100644 SpigotTimings.processQueueTimer.startTiming(); // Spigot while (!processQueue.isEmpty()) { -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0017-EntityDismountEvent-teleport-crash-fix.patch b/Patches/CraftBukkit-Patches/0017-EntityDismountEvent-teleport-crash-fix.patch index aa9d1ee4c..96f8edb46 100644 --- a/Patches/CraftBukkit-Patches/0017-EntityDismountEvent-teleport-crash-fix.patch +++ b/Patches/CraftBukkit-Patches/0017-EntityDismountEvent-teleport-crash-fix.patch @@ -1,4 +1,4 @@ -From b0eb73047d9e8e06c2822142dc8c443efa9eda2e Mon Sep 17 00:00:00 2001 +From 08847caa91ab71f3a67bbb4bef1ebd00acac6f6a Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 22 Nov 2015 14:41:11 +1300 Subject: [PATCH] EntityDismountEvent & teleport crash fix @@ -133,5 +133,5 @@ index efbf1a8..ad53590 100644 // Spigot start if (!location.getWorld().equals(getWorld())) { -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0018-Server-freezing-fix-fake-yaw-pitch.patch b/Patches/CraftBukkit-Patches/0018-Server-freezing-fix-fake-yaw-pitch.patch index 17ceb565f..6520d820a 100644 --- a/Patches/CraftBukkit-Patches/0018-Server-freezing-fix-fake-yaw-pitch.patch +++ b/Patches/CraftBukkit-Patches/0018-Server-freezing-fix-fake-yaw-pitch.patch @@ -1,4 +1,4 @@ -From 6514e2834135adf7d133d11bbcad9377544d73f0 Mon Sep 17 00:00:00 2001 +From 76027e46da8c636f0c59912ce06379373880862c Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 27 Nov 2015 22:26:34 +1300 Subject: [PATCH] Server freezing, fix fake yaw/pitch @@ -64,5 +64,5 @@ index 5edef3e..d3b1586 100644 } else { WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension); -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0019-Sound-and-vehicle-fixes.patch b/Patches/CraftBukkit-Patches/0019-Sound-and-vehicle-fixes.patch index 210afef18..44a52d43b 100644 --- a/Patches/CraftBukkit-Patches/0019-Sound-and-vehicle-fixes.patch +++ b/Patches/CraftBukkit-Patches/0019-Sound-and-vehicle-fixes.patch @@ -1,4 +1,4 @@ -From 22472882d2708e0eb4e35f0d31978b70d2c4b4f5 Mon Sep 17 00:00:00 2001 +From c97267c98bac90ee24f0bb7bfa710a58f3c990af Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Tue, 12 Jan 2016 19:56:07 +1300 Subject: [PATCH] Sound and vehicle fixes @@ -22,5 +22,5 @@ index 0cc8f9b..dd07600 100644 set(DIG_WOOL, "dig.cloth"); set(DIG_GRASS, "dig.grass"); -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0020-md_5-s-player-interaction-for-specs-patch.patch b/Patches/CraftBukkit-Patches/0020-md_5-s-player-interaction-for-specs-patch.patch index 0da7d8679..29de498bd 100644 --- a/Patches/CraftBukkit-Patches/0020-md_5-s-player-interaction-for-specs-patch.patch +++ b/Patches/CraftBukkit-Patches/0020-md_5-s-player-interaction-for-specs-patch.patch @@ -1,4 +1,4 @@ -From 1e687cfb7b343f9c2a2e3cfdef346a896be747bb Mon Sep 17 00:00:00 2001 +From fd52634ee952e6c24f5d874d4130abae2524ac39 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 29 Jan 2016 16:59:00 +1300 Subject: [PATCH] md_5's player interaction for specs patch @@ -27,5 +27,5 @@ index d3b1586..6fd49b3 100644 // Arm swing animation PlayerAnimationEvent event = new PlayerAnimationEvent(this.getPlayer()); -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0021-Fix-enderman-teleporting-when-vegetated.patch b/Patches/CraftBukkit-Patches/0021-Fix-enderman-teleporting-when-vegetated.patch index 15a0ffa0f..bc2a8d895 100644 --- a/Patches/CraftBukkit-Patches/0021-Fix-enderman-teleporting-when-vegetated.patch +++ b/Patches/CraftBukkit-Patches/0021-Fix-enderman-teleporting-when-vegetated.patch @@ -1,4 +1,4 @@ -From 125596ec9aee25d141781b4010eac881c7b36eb5 Mon Sep 17 00:00:00 2001 +From 967ca8d8c01a90f93d52bd9aa2bbe1e9d2fd7a66 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 29 Jan 2016 16:59:12 +1300 Subject: [PATCH] Fix enderman teleporting when vegetated @@ -21,5 +21,5 @@ index a250062..5ad2d07 100644 double d4 = this.locY; double d5 = this.locZ; -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0022-Implement-Sentry-for-exception-monitoring.patch b/Patches/CraftBukkit-Patches/0022-Implement-Sentry-for-exception-monitoring.patch index 65f2b6897..43d2858c1 100644 --- a/Patches/CraftBukkit-Patches/0022-Implement-Sentry-for-exception-monitoring.patch +++ b/Patches/CraftBukkit-Patches/0022-Implement-Sentry-for-exception-monitoring.patch @@ -1,4 +1,4 @@ -From 742d6b5d828128519f06f7c6f5e188847263e609 Mon Sep 17 00:00:00 2001 +From 87e9cd7cd56efee729c47710a8b1d9ed265c8903 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 7 Feb 2016 20:28:54 +1100 Subject: [PATCH] Implement Sentry for exception monitoring. @@ -323,5 +323,5 @@ index f37d1c2..b9d8704 100644 -- -2.5.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0177-Dual-version-patch-and-some-other-fixes.patch b/Patches/CraftBukkit-Patches/0023-Dual-version-patch-and-some-other-fixes.patch similarity index 98% rename from Patches/CraftBukkit-Patches/0177-Dual-version-patch-and-some-other-fixes.patch rename to Patches/CraftBukkit-Patches/0023-Dual-version-patch-and-some-other-fixes.patch index 31947a9ff..8a8cf38ec 100644 --- a/Patches/CraftBukkit-Patches/0177-Dual-version-patch-and-some-other-fixes.patch +++ b/Patches/CraftBukkit-Patches/0023-Dual-version-patch-and-some-other-fixes.patch @@ -1,4 +1,4 @@ -From 4b151cd529c5de0d32cc78357f417c9fa4866198 Mon Sep 17 00:00:00 2001 +From b764e7185cb062f830a74b814017b148a062a59a Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 29 Nov 2015 02:53:00 +1300 Subject: [PATCH] Dual version patch and some other fixes @@ -1836,10 +1836,10 @@ index dec091e..9e351b1 100644 public Object b() { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7165579..96d9312 100644 +index 721d0e6..a301af7 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -128,6 +128,12 @@ public abstract class Entity implements ICommandListener { +@@ -127,6 +127,12 @@ public abstract class Entity implements ICommandListener { public boolean fromMobSpawner; public void inactiveTick() { } // Spigot end @@ -1852,7 +1852,7 @@ index 7165579..96d9312 100644 public int getId() { return this.id; -@@ -201,11 +207,11 @@ public abstract class Entity implements ICommandListener { +@@ -206,11 +212,11 @@ public abstract class Entity implements ICommandListener { // Spigot end this.datawatcher = new DataWatcher(this); @@ -1869,7 +1869,7 @@ index 7165579..96d9312 100644 this.h(); } -@@ -839,7 +845,7 @@ public abstract class Entity implements ICommandListener { +@@ -844,7 +850,7 @@ public abstract class Entity implements ICommandListener { } public void b(boolean flag) { @@ -1878,24 +1878,7 @@ index 7165579..96d9312 100644 } protected boolean s_() { -@@ -1612,11 +1618,13 @@ public abstract class Entity implements ICommandListener { - EntityDismountEvent exitEvent1 = null; - if (this.vehicle != null) { - if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle)) -+ { - exitEvent = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity); -- pluginManager.callEvent(exitEvent); -+ pluginManager.callEvent(exitEvent); - -- if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) { -- return; -+ if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) { -+ return; -+ } - } - - exitEvent1 = new EntityDismountEvent(this.vehicle.getBukkitEntity(), this.bukkitEntity); -@@ -1748,9 +1756,9 @@ public abstract class Entity implements ICommandListener { +@@ -1760,9 +1766,9 @@ public abstract class Entity implements ICommandListener { byte b0 = this.datawatcher.getByte(0); if (flag) { @@ -1907,7 +1890,7 @@ index 7165579..96d9312 100644 } } -@@ -1760,7 +1768,7 @@ public abstract class Entity implements ICommandListener { +@@ -1772,7 +1778,7 @@ public abstract class Entity implements ICommandListener { } public void setAirTicks(int i) { @@ -1916,7 +1899,7 @@ index 7165579..96d9312 100644 } public void onLightningStrike(EntityLightning entitylightning) { -@@ -2123,7 +2131,7 @@ public abstract class Entity implements ICommandListener { +@@ -2135,7 +2141,7 @@ public abstract class Entity implements ICommandListener { s = s.substring(0, 256); } // CraftBukkit end @@ -1925,7 +1908,7 @@ index 7165579..96d9312 100644 } public String getCustomName() { -@@ -2135,7 +2143,7 @@ public abstract class Entity implements ICommandListener { +@@ -2147,7 +2153,7 @@ public abstract class Entity implements ICommandListener { } public void setCustomNameVisible(boolean flag) { @@ -2384,7 +2367,7 @@ index ed7f549..2198042 100644 public EntityEnderDragon(World world) { super(world); diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index a250062..5c09068 100644 +index 5ad2d07..7039b8d 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -7,6 +7,7 @@ import java.util.List; @@ -2417,7 +2400,7 @@ index a250062..5c09068 100644 } public void b(NBTTagCompound nbttagcompound) { -@@ -254,7 +257,7 @@ public class EntityEnderman extends EntityMonster { +@@ -259,7 +262,7 @@ public class EntityEnderman extends EntityMonster { } public void setCarried(IBlockData iblockdata) { @@ -2426,7 +2409,7 @@ index a250062..5c09068 100644 } public IBlockData getCarried() { -@@ -306,7 +309,7 @@ public class EntityEnderman extends EntityMonster { +@@ -311,7 +314,7 @@ public class EntityEnderman extends EntityMonster { } public void a(boolean flag) { @@ -2888,10 +2871,10 @@ index 1008567..a3d7b66 100644 this.world.updateAdjacentComparators(this.blockPosition, Blocks.AIR); } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 96b3905..d0af93f 100644 +index 19fc521..710def4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -114,11 +114,17 @@ public abstract class EntityLiving extends Entity { +@@ -113,11 +113,17 @@ public abstract class EntityLiving extends Entity { _ghost = ghost; } @@ -2910,7 +2893,7 @@ index 96b3905..d0af93f 100644 this.k = true; this.aH = (float) ((Math.random() + 1.0D) * 0.009999999776482582D); this.setPosition(this.locX, this.locY, this.locZ); -@@ -129,10 +135,11 @@ public abstract class EntityLiving extends Entity { +@@ -128,10 +134,11 @@ public abstract class EntityLiving extends Entity { } protected void h() { @@ -2926,7 +2909,7 @@ index 96b3905..d0af93f 100644 } protected void initAttributes() { -@@ -547,16 +554,16 @@ public abstract class EntityLiving extends Entity { +@@ -546,16 +553,16 @@ public abstract class EntityLiving extends Entity { } else { int i = PotionBrewer.a(this.effects.values()); @@ -2947,7 +2930,7 @@ index 96b3905..d0af93f 100644 } public void removeAllEffects() { -@@ -709,11 +716,11 @@ public abstract class EntityLiving extends Entity { +@@ -708,11 +715,11 @@ public abstract class EntityLiving extends Entity { player.setRealHealth(f); } @@ -2961,7 +2944,7 @@ index 96b3905..d0af93f 100644 } public boolean damageEntity(DamageSource damagesource, float f) { -@@ -1174,7 +1181,7 @@ public abstract class EntityLiving extends Entity { +@@ -1173,7 +1180,7 @@ public abstract class EntityLiving extends Entity { } public final void o(int i) { @@ -4632,7 +4615,7 @@ index 0000000..eb425dc + } +} diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 64f6a9b..bec9f80 100644 +index 215648e..fa1a1e1 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -22,6 +22,16 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -4652,21 +4635,6 @@ index 64f6a9b..bec9f80 100644 switch (HandshakeListener.SyntheticClass_1.a[packethandshakinginsetprotocol.a().ordinal()]) { case 1: this.b.a(EnumProtocol.LOGIN); -@@ -61,12 +71,8 @@ public class HandshakeListener implements PacketHandshakingInListener { - org.apache.logging.log4j.LogManager.getLogger().debug("Failed to check connection throttle", t); - } - // CraftBukkit end -- -- if (packethandshakinginsetprotocol.b() > 47) { -- chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.8" ) ); // Spigot -- this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); -- this.b.close(chatcomponenttext); -- } else if (packethandshakinginsetprotocol.b() < 47) { -+ -+ if (!supported) { - chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.8" ) ); // Spigot - this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); - this.b.close(chatcomponenttext); diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java new file mode 100644 index 0000000..db19ad4 @@ -7051,7 +7019,7 @@ index abb24c8..2d8db9c 100644 this.players.remove(entityplayer); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5edef3e..a8c5b44 100644 +index 6fd49b3..43fc802 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -386,7 +386,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -7154,7 +7122,7 @@ index 5edef3e..a8c5b44 100644 this.sendPacket(new PacketPlayOutSetSlot(this.player.activeContainer.windowId, slot.rawSlotIndex, this.player.inventory.getItemInHand())); } } -@@ -1992,7 +1993,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -2003,7 +2004,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList itemstack1 = this.player.inventory.getItemInHand(); if (itemstack1 != null) { @@ -7163,7 +7131,7 @@ index 5edef3e..a8c5b44 100644 // CraftBukkit start itemstack1 = new ItemStack(Items.WRITTEN_BOOK); itemstack1.a("author", (NBTBase) (new NBTTagString(this.player.getName()))); -@@ -2247,4 +2248,65 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -2258,4 +2259,65 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList } } @@ -7303,20 +7271,12 @@ index eca86db..e61032c 100644 entity = (Entity) this.k.get(i); // CraftBukkit start - Fixed an NPE diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index efbf1a8..dbc7b54 100644 +index ad53590..48f7d58 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1,6 +1,7 @@ - package org.bukkit.craftbukkit.entity; - - import com.google.common.base.Preconditions; -+import com.google.common.primitives.Doubles; - import java.util.ArrayList; - import java.util.Collection; - import java.util.List; -@@ -234,6 +235,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { - // If this entity is riding another entity, we must dismount before teleporting. - entity.mount(null); +@@ -239,6 +239,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { + return false; + } + if (!Doubles.isFinite(location.getX()) || !Doubles.isFinite(location.getY()) || !Doubles.isFinite(location.getZ())) + { @@ -7376,5 +7336,5 @@ index 18da426..79bd517 100644 @Override -- -1.9.5.msysgit.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0178-Added-new-stuff-elytra-and-levitation.patch b/Patches/CraftBukkit-Patches/0024-Added-new-stuff-elytra-and-levitation.patch similarity index 98% rename from Patches/CraftBukkit-Patches/0178-Added-new-stuff-elytra-and-levitation.patch rename to Patches/CraftBukkit-Patches/0024-Added-new-stuff-elytra-and-levitation.patch index e37255cc5..842557047 100644 --- a/Patches/CraftBukkit-Patches/0178-Added-new-stuff-elytra-and-levitation.patch +++ b/Patches/CraftBukkit-Patches/0024-Added-new-stuff-elytra-and-levitation.patch @@ -1,4 +1,4 @@ -From db79f5bc9cf52fa7bb9cf080e206d88641fa0617 Mon Sep 17 00:00:00 2001 +From 78251d4e835e96e8119c0f0ce87ad915339f5093 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 30 Dec 2015 21:06:12 +1300 Subject: [PATCH] Added new stuff, elytra and levitation @@ -161,10 +161,10 @@ index b86369b..4301bc9 100644 this.c("127.0.0.1"); } else { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 96d9312..2f52ea2 100644 +index a301af7..51ca1f3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1763,6 +1763,50 @@ public abstract class Entity implements ICommandListener { +@@ -1773,6 +1773,50 @@ public abstract class Entity implements ICommandListener { } @@ -259,10 +259,10 @@ index 5294c66..743df69 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d0af93f..d074110 100644 +index 710def4..41eede5 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -956,7 +956,7 @@ public abstract class EntityLiving extends Entity { +@@ -955,7 +955,7 @@ public abstract class EntityLiving extends Entity { if (i > 0) { // CraftBukkit start @@ -271,7 +271,7 @@ index d0af93f..d074110 100644 return; } // CraftBukkit end -@@ -1668,6 +1668,7 @@ public abstract class EntityLiving extends Entity { +@@ -1667,6 +1667,7 @@ public abstract class EntityLiving extends Entity { this.aZ *= 0.98F; this.ba *= 0.98F; this.bb *= 0.9F; @@ -279,7 +279,7 @@ index d0af93f..d074110 100644 SpigotTimings.timerEntityAIMove.startTiming(); // Spigot this.g(this.aZ, this.ba); SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot -@@ -1682,6 +1683,37 @@ public abstract class EntityLiving extends Entity { +@@ -1681,6 +1682,37 @@ public abstract class EntityLiving extends Entity { this.world.methodProfiler.b(); } @@ -382,7 +382,7 @@ index eb425dc..f3877e4 100644 a(EnumProtocolDirection.SERVERBOUND, PacketPlayInBlockPlace.class, 8, 28); a(EnumProtocolDirection.SERVERBOUND, PacketPlayInRightClick.class, -1, 29); diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index bec9f80..824ec1b 100644 +index fa1a1e1..31e1ea1 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -25,7 +25,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -796,7 +796,7 @@ index 9a3b275..ef18545 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a8c5b44..16f8609 100644 +index 43fc802..6372719 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -386,7 +386,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -829,7 +829,7 @@ index a8c5b44..16f8609 100644 default: throw new IllegalArgumentException("Invalid player action"); } -@@ -1445,6 +1450,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -1456,6 +1461,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList return; } @@ -843,7 +843,7 @@ index a8c5b44..16f8609 100644 InventoryView inventory = this.player.activeContainer.getBukkitView(); SlotType type = CraftInventoryView.getSlotType(inventory, packetplayinwindowclick.b()); -@@ -2246,6 +2258,12 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -2257,6 +2269,12 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList ; } @@ -856,7 +856,7 @@ index a8c5b44..16f8609 100644 } } -@@ -2253,7 +2271,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList +@@ -2264,7 +2282,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList public void a(PacketPlayInUnknownPosition paramPacketPlayInUnknownPosition){System.out.print("Received unknown position");} @@ -867,7 +867,7 @@ index a8c5b44..16f8609 100644 public void a(PacketPlayInRightClick paramPacketPlayInRightClick) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index d3d19dd..81e231d 100644 +index da576bc..8d826df 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1032,10 +1032,21 @@ public abstract class PlayerList { @@ -1376,5 +1376,5 @@ index 3a362b7..f55ddcd 100644 Material.BED_BLOCK, Material.NETHER_WARTS, -- -1.9.5.msysgit.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0179-Some-debug-and-crash-fixes.patch b/Patches/CraftBukkit-Patches/0025-Some-debug-and-crash-fixes.patch similarity index 97% rename from Patches/CraftBukkit-Patches/0179-Some-debug-and-crash-fixes.patch rename to Patches/CraftBukkit-Patches/0025-Some-debug-and-crash-fixes.patch index 4b5ea2931..f1bb5aa79 100644 --- a/Patches/CraftBukkit-Patches/0179-Some-debug-and-crash-fixes.patch +++ b/Patches/CraftBukkit-Patches/0025-Some-debug-and-crash-fixes.patch @@ -1,4 +1,4 @@ -From d1cf06c308d35a765cf2d11b170a9d0f8fabb418 Mon Sep 17 00:00:00 2001 +From 4374ab4f758cd98b874600ad6c2b5c1474135a93 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Wed, 30 Dec 2015 22:38:30 +1300 Subject: [PATCH] Some debug and crash fixes @@ -53,7 +53,7 @@ index ef51cd4..54c1ec9 100644 mapChunks = list; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 81e231d..42d9e76 100644 +index 8d826df..b50db37 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -168,7 +168,8 @@ public abstract class PlayerList { @@ -78,5 +78,5 @@ index 81e231d..42d9e76 100644 // entityplayer1.syncInventory(); // CraftBukkit end -- -1.9.5.msysgit.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0180-Current-patch-stuff.patch b/Patches/CraftBukkit-Patches/0026-Current-patch-stuff.patch similarity index 80% rename from Patches/CraftBukkit-Patches/0180-Current-patch-stuff.patch rename to Patches/CraftBukkit-Patches/0026-Current-patch-stuff.patch index 3c043be72..6226e74b6 100644 --- a/Patches/CraftBukkit-Patches/0180-Current-patch-stuff.patch +++ b/Patches/CraftBukkit-Patches/0026-Current-patch-stuff.patch @@ -1,27 +1,14 @@ -From 0d1bec3dad53441ead8ac0f22e2464a924fb8818 Mon Sep 17 00:00:00 2001 +From 7c7c941e8a0275a063065f592d57db5bdc103db8 Mon Sep 17 00:00:00 2001 From: git Date: Thu, 25 Feb 2016 18:20:02 +1300 Subject: [PATCH] Current patch stuff -diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 5c09068..45a9acb 100644 ---- a/src/main/java/net/minecraft/server/EntityEnderman.java -+++ b/src/main/java/net/minecraft/server/EntityEnderman.java -@@ -160,6 +160,8 @@ public class EntityEnderman extends EntityMonster { - } - - protected boolean k(double d0, double d1, double d2) { -+ if (isVegetated()) -+ return false; - double d3 = this.locX; - double d4 = this.locY; - double d5 = this.locZ; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index d074110..e9a324a 100644 +index 41eede5..40d4232 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -550,13 +550,13 @@ public abstract class EntityLiving extends Entity { +@@ -549,13 +549,13 @@ public abstract class EntityLiving extends Entity { protected void B() { if (this.effects.isEmpty()) { this.bj(); @@ -55,7 +42,7 @@ index f3877e4..0343bf8 100644 } diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 824ec1b..9d27032 100644 +index 31e1ea1..f6e8560 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -25,7 +25,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -275,45 +262,6 @@ index 2ce95fa..51a3a21 100644 } public void a(PacketListenerPlayOut packetlistenerplayout) -diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 16f8609..b1400c7 100644 ---- a/src/main/java/net/minecraft/server/PlayerConnection.java -+++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1212,6 +1212,17 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList - if (movingobjectposition == null || movingobjectposition.type != MovingObjectPosition.EnumMovingObjectType.BLOCK) { - CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_AIR, this.player.inventory.getItemInHand()); - } -+ // Spigot start -+ else if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK -+ && (player.playerInteractManager.getGameMode() == WorldSettings.EnumGamemode.ADVENTURE || player.playerInteractManager.getGameMode() == WorldSettings.EnumGamemode.SPECTATOR)) { -+ // RIGHT_CLICK_BLOCK sets this flag -+ if (player.playerInteractManager.firedInteract) { -+ player.playerInteractManager.firedInteract = false; -+ } else { -+ CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, movingobjectposition.a(), movingobjectposition.direction, player.inventory.getItemInHand(), true); -+ } -+ } -+ // Spigot end - - // Arm swing animation - PlayerAnimationEvent event = new PlayerAnimationEvent(this.getPlayer()); -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java -index 0cc8f9b..dd07600 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java -@@ -14,9 +14,9 @@ public class CraftSound { - set(AMBIENCE_RAIN, "ambient.weather.rain"); - set(AMBIENCE_THUNDER, "ambient.weather.thunder"); - // Damage -- set(HURT_FLESH, "game.neutral.hurt"); -- set(FALL_BIG, "game.neutral.hurt.fall.big"); -- set(FALL_SMALL, "game.neutral.hurt.fall.small"); -+ set(HURT_FLESH, "game.player.hurt"); -+ set(FALL_BIG, "game.player.hurt.fall.big"); -+ set(FALL_SMALL, "game.player.hurt.fall.small"); - // Dig Sounds - set(DIG_WOOL, "dig.cloth"); - set(DIG_GRASS, "dig.grass"); -- -1.9.5.msysgit.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0181-Changed-maven-version-fixed-entity-movement-fixed-so.patch b/Patches/CraftBukkit-Patches/0027-Changed-maven-version-fixed-entity-movement-fixed-so.patch similarity index 97% rename from Patches/CraftBukkit-Patches/0181-Changed-maven-version-fixed-entity-movement-fixed-so.patch rename to Patches/CraftBukkit-Patches/0027-Changed-maven-version-fixed-entity-movement-fixed-so.patch index 0ba521e5f..e1ced17c3 100644 --- a/Patches/CraftBukkit-Patches/0181-Changed-maven-version-fixed-entity-movement-fixed-so.patch +++ b/Patches/CraftBukkit-Patches/0027-Changed-maven-version-fixed-entity-movement-fixed-so.patch @@ -1,4 +1,4 @@ -From af6ac4b09da7ad63ebb568333807c7621398f0a6 Mon Sep 17 00:00:00 2001 +From 9dfce5478dba231619b0527f28af3640aef5480c Mon Sep 17 00:00:00 2001 From: git Date: Sun, 28 Feb 2016 00:37:30 +1300 Subject: [PATCH] Changed maven version, fixed entity movement, fixed sound @@ -6,11 +6,11 @@ Subject: [PATCH] Changed maven version, fixed entity movement, fixed sound diff --git a/pom.xml b/pom.xml -index 91627ff..1ea9f81 100644 +index ceb3ec2..a44f7b1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ - org.spigotmc + com.mineplex spigot jar - 1.8.8-R0.1-SNAPSHOT @@ -61,7 +61,7 @@ index e5c947f..9cd9be6 100644 this.b(); diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 9d27032..21dbf3b 100644 +index f6e8560..fae7922 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -25,7 +25,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -131,5 +131,5 @@ index b72b7d7..bcfdab9 100644 packetdataserializer.writeInt(c); packetdataserializer.writeInt(d); -- -1.9.5.msysgit.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0182-Update-to-1.9-fix-blocking.patch b/Patches/CraftBukkit-Patches/0028-Update-to-1.9-fix-blocking.patch similarity index 91% rename from Patches/CraftBukkit-Patches/0182-Update-to-1.9-fix-blocking.patch rename to Patches/CraftBukkit-Patches/0028-Update-to-1.9-fix-blocking.patch index 1bd644b81..da305911b 100644 --- a/Patches/CraftBukkit-Patches/0182-Update-to-1.9-fix-blocking.patch +++ b/Patches/CraftBukkit-Patches/0028-Update-to-1.9-fix-blocking.patch @@ -1,14 +1,14 @@ -From 48550b9915d18d2d4a528c4028c8fa35a97a036c Mon Sep 17 00:00:00 2001 +From 6e5d8f23968f7b24c084816f2b55edfbc99e820f Mon Sep 17 00:00:00 2001 From: git Date: Tue, 1 Mar 2016 09:29:32 +1300 Subject: [PATCH] Update to 1.9, fix blocking diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2f52ea2..c2ce92f 100644 +index 51ca1f3..c6d3183 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1745,6 +1745,14 @@ public abstract class Entity implements ICommandListener { +@@ -1755,6 +1755,14 @@ public abstract class Entity implements ICommandListener { } public void f(boolean flag) { @@ -43,7 +43,7 @@ index 743df69..998ea69 100644 public void t_() { diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 21dbf3b..0d8aff4 100644 +index fae7922..7d12515 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -25,7 +25,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -56,5 +56,5 @@ index 21dbf3b..0d8aff4 100644 if (supported) { -- -1.9.5.msysgit.0 +2.7.4 diff --git a/Patches/CraftBukkit-Patches/0029-Fix-TnT-Datawatcher.patch b/Patches/CraftBukkit-Patches/0029-Fix-TnT-Datawatcher.patch new file mode 100644 index 000000000..489cf7b69 --- /dev/null +++ b/Patches/CraftBukkit-Patches/0029-Fix-TnT-Datawatcher.patch @@ -0,0 +1,29 @@ +From 6e7c7edf9e6144385bc909b17dd14539d8ac98d6 Mon Sep 17 00:00:00 2001 +From: md_5 +Date: Mon, 25 Apr 2016 10:36:56 +1000 +Subject: [PATCH] Fix TnT Datawatcher + + +diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java +index 9b13620..4f4511f 100644 +--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java ++++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java +@@ -97,13 +97,13 @@ public class EntityTNTPrimed extends Entity { + + protected void a(NBTTagCompound nbttagcompound) { + this.fuseTicks = nbttagcompound.getByte("Fuse"); +- datawatcher.a(24, 0, META_FUSE, fuseTicks); ++ datawatcher.watch(24, 0, META_FUSE, fuseTicks); + } + + public void setFuseTicks(int newTicks) + { + fuseTicks = newTicks; +- datawatcher.a(24, 0, META_FUSE, fuseTicks); ++ datawatcher.watch(24, 0, META_FUSE, fuseTicks); + } + + public EntityLiving getSource() { +-- +2.7.4 + diff --git a/Patches/craftbukkit.jar b/Patches/craftbukkit.jar index cef2d1023..8264b8c00 100644 Binary files a/Patches/craftbukkit.jar and b/Patches/craftbukkit.jar differ diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index c642dee43..3e33c7708 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -76,6 +76,7 @@ import nautilus.game.arcade.addons.SoupAddon; import nautilus.game.arcade.addons.TeamArmorAddon; import nautilus.game.arcade.addons.compass.CompassAddon; import nautilus.game.arcade.command.DisguiseCommand; +import nautilus.game.arcade.command.GameCmdModeCommand; import nautilus.game.arcade.command.GameCommand; import nautilus.game.arcade.command.KitUnlockCommand; import nautilus.game.arcade.command.RequiredRankCommand; @@ -213,6 +214,10 @@ public class ArcadeManager extends MiniPlugin implements IRelation //Server Property private Rank _requiredRank; + //Game commands + public static final String GAME_CMD_MODE_FILE = "GAME_CMD_MODE.dat"; + private boolean _gameCommandMode; + public ArcadeManager(Arcade plugin, ServerStatusManager serverStatusManager, GameServerConfig serverConfig, CoreClientManager clientManager, DonationManager donationManager, DamageManager damageManager, StatsManager statsManager, IncognitoManager incognitoManager, AchievementManager achievementManager, DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, Chat chat, @@ -355,6 +360,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation } loadRequiredRank(); + + _gameCommandMode = checkGameCommandMode(); } @Override @@ -365,6 +372,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation addCommand(new KitUnlockCommand(this)); addCommand(new DisguiseCommand(this)); addCommand(new RequiredRankCommand(this)); + addCommand(new GameCmdModeCommand(this)); } public GameChatManager getGameChatManager() @@ -1550,4 +1558,58 @@ public class ArcadeManager extends MiniPlugin implements IRelation { return new ArcadePlayer(player, getCustomDataManager(), this); } + + /** + * Returns whether this server has a file, stating that it allows game commands. + * + * @return Whether this server is in game command mode. + */ + private boolean checkGameCommandMode() + { + return new File(GAME_CMD_MODE_FILE).exists(); + } + + /** + * @return Whether this server is in game command mode. + */ + public boolean isGameCommandMode() + { + return _gameCommandMode; + } + + /** + * Sets this server's game command mode state. + * + * @param state Whether to enable or disable game commands. + */ + public void setGameCommandMode(boolean state) + { + _gameCommandMode = state; + } + + /** + * Finds whether or not a player can use a game command or not. + *

+ * Sends a denial alert if they can't. + * + * @param player The player attempting to use the command. + * @return Whether or not the player can successfully use the command. + */ + public boolean canPlayerUseGameCmd(Player player) + { + if (_gameCommandMode) + { + // When enabled, anyone can use game commands. + return true; + } + + // Check whether they are of high enough rank status. + if (!GetClients().hasRank(player, Rank.JNR_DEV)) + { + player.sendMessage(F.main("Server", "You are not allowed to use game commands.")); + return false; + } + + return true; + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCmdModeCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCmdModeCommand.java new file mode 100644 index 000000000..7bd1080e4 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCmdModeCommand.java @@ -0,0 +1,61 @@ +package nautilus.game.arcade.command; + +import java.io.File; +import java.io.IOException; + +import org.bukkit.entity.Player; + +import mineplex.core.command.CommandBase; +import mineplex.core.common.Rank; +import mineplex.core.common.util.C; +import mineplex.core.common.util.F; +import nautilus.game.arcade.ArcadeManager; + +/** + * A command to toggle this server's game command mode state. + */ +public class GameCmdModeCommand extends CommandBase +{ + public GameCmdModeCommand(ArcadeManager plugin) + { + super(plugin, Rank.JNR_DEV, "gamecmdmode"); + } + + @Override + public void Execute(Player caller, String[] args) + { + File file = new File(ArcadeManager.GAME_CMD_MODE_FILE); + + if (Plugin.isGameCommandMode()) + { + // Disable game command mode. + if (file.exists()) + { + file.delete(); + } + + Plugin.setGameCommandMode(false); + caller.sendMessage(F.main("Server", "Game commands are now " + C.cRed + "disabled" + + C.cGray + ".")); + } + else + { + // Enable game command mode. + if (!file.exists()) + { + try + { + file.createNewFile(); + } + catch (IOException e) + { + e.printStackTrace(); + } + } + + Plugin.setGameCommandMode(true); + caller.sendMessage(F.main("Server", "Game commands are now " + C.cGreen + "enabled" + + C.cGray + ".")); + } + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java index 76e4edb1c..67b11d9eb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java @@ -12,7 +12,7 @@ public class GameCommand extends MultiCommandBase { public GameCommand(ArcadeManager plugin) { - super(plugin, Rank.ADMIN, new Rank[] {Rank.MAPLEAD, Rank.JNR_DEV}, "game"); + super(plugin, Rank.ALL, "game"); AddCommand(new StartCommand(Plugin)); AddCommand(new StopCommand(Plugin)); @@ -23,9 +23,9 @@ public class GameCommand extends MultiCommandBase protected void Help(Player caller, String[] args) { UtilPlayer.message(caller, F.main(Plugin.getName(), "Commands List:")); - UtilPlayer.message(caller, F.help("/game start", "Start the current game", Rank.ADMIN)); - UtilPlayer.message(caller, F.help("/game stop", "Stop the current game", Rank.ADMIN)); - UtilPlayer.message(caller, F.help("/game set (MapSource) (Map)", "Set the current game or next game", Rank.ADMIN)); + UtilPlayer.message(caller, F.help("/game start", "Start the current game", Rank.ALL)); + UtilPlayer.message(caller, F.help("/game stop", "Stop the current game", Rank.ALL)); + UtilPlayer.message(caller, F.help("/game set (MapSource) (Map)", "Set the current game or next game", Rank.ALL)); UtilPlayer.message(caller, F.main("Tip", "Use TAB for games/maps!")); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java index 78cc48c23..6dd746703 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java @@ -26,7 +26,12 @@ public class SetCommand extends CommandBase { if (Plugin.GetGame() == null) return; - + + if (!Plugin.canPlayerUseGameCmd(caller)) + { + return; + } + if (args.length == 0) { caller.sendMessage(F.help("/game set (MapSource) (Map)", "Set the current game or next game", Rank.ADMIN)); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java index 2d45496ae..f8e058e58 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java @@ -18,6 +18,11 @@ public class StartCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { + if (!Plugin.canPlayerUseGameCmd(caller)) + { + return; + } + if (Plugin.GetGame() == null || Plugin.GetGame().GetState() == GameState.Loading) { caller.sendMessage(C.cRed + C.Bold + "Game is loading..."); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StopCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StopCommand.java index d7a255c84..f4b5ab7ad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StopCommand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StopCommand.java @@ -19,6 +19,11 @@ public class StopCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { + if (!Plugin.canPlayerUseGameCmd(caller)) + { + return; + } + if (Plugin.GetGame() == null) return; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java index 0d51c64a0..20641932c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java @@ -425,6 +425,8 @@ public class Paintball extends TeamGame return; Player thrower = (Player)event.getEntity().getShooter(); + if (!IsAlive(thrower)) + return; GameTeam throwerTeam = GetTeam(thrower); if (throwerTeam == null) return;