JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix TnT datawatcher

This commit is contained in:
md_5 2016-04-25 10:37:18 +10:00
parent d8f7301e69
commit 807b12e846
36 changed files with 84 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Patches/Bukkit-Patches/0001-Update-groupId.patch
View File

@ -1,4 +1,4 @@
From d72df4b66fe41f68effed29b43279f201b5e304e Mon Sep 17 00:00:00 2001
From b3c9291331205afc5b78e85435b5daa099813a1b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 15 Feb 2016 09:39:33 +1100
Subject: [PATCH] Update groupId

2
Patches/Bukkit-Patches/0002-LivingEntity-changes.patch
View File

@ -1,4 +1,4 @@
From b22d42784ec742a4c7b186c89247f3fa801a21ce Mon Sep 17 00:00:00 2001
From ad41271f22ea5f75476451b2c23f3ab0e54e2a6d Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 23 Oct 2015 21:23:18 +1300
Subject: [PATCH] LivingEntity changes

2
Patches/Bukkit-Patches/0003-EntityDismountEvent.patch
View File

@ -1,4 +1,4 @@
From 0c03b3de8400ea257068d1a27525c1c6b8260b5a Mon Sep 17 00:00:00 2001
From d3dc42fb5ba3a934b78f0ced14011facb075887d Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Sun, 22 Nov 2015 14:37:11 +1300
Subject: [PATCH] EntityDismountEvent

2
Patches/Bukkit-Patches/0004-Add-Elytra.patch
View File

@ -1,4 +1,4 @@
From 62f6c04cb305cc1d3555eb098a8d49e04d2a7c97 Mon Sep 17 00:00:00 2001
From 0c6ede1fb4e6dbaac8d8acf4fa72aa28ca6d9dc7 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Wed, 30 Dec 2015 19:57:10 +1300
Subject: [PATCH] Add Elytra

2
Patches/Bukkit-Patches/0005-Levitation-potion-effect.patch
View File

@ -1,4 +1,4 @@
From 520815eeeff49bd9f72f78ce751e10f33df625cf Mon Sep 17 00:00:00 2001
From a465cb15a5aea5c5f70957d5af0fe6b55108bff7 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Wed, 30 Dec 2015 21:05:47 +1300
Subject: [PATCH] Levitation potion effect

22
Patches/Bukkit-Patches/0006-Update-pom-version.patch Normal file
View File

@ -0,0 +1,22 @@
From c8afa4514a06be8257d3a05e0d261d4051a4dad0 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
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 @@
<groupId>com.mineplex</groupId>
<artifactId>spigot-api</artifactId>
- <version>1.8.8-R0.1-SNAPSHOT</version>
+ <version>1.8.8-1.9-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Spigot-API</name>
--
2.7.4

2
Patches/CraftBukkit-Patches/0001-Update-groupId.patch
View File

@ -1,4 +1,4 @@
From b2cc92af9d9345c57865f2393bd03a290948c27b Mon Sep 17 00:00:00 2001
From 4c5177323b3556b7c6616ddd5bfa854a0b1b7e3c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 15 Feb 2016 09:56:14 +1100
Subject: [PATCH] Update groupId

2
Patches/CraftBukkit-Patches/0002-Modify-packets-to-public.patch
View File

@ -1,4 +1,4 @@
From 6f49ec5176a6b1c3148d2aa3e2c66cf15450a4ac Mon Sep 17 00:00:00 2001
From 2f928d1889df46e390373df141f75a07b267cb33 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 23 Oct 2015 21:14:50 +1300
Subject: [PATCH] Modify packets to public

2
Patches/CraftBukkit-Patches/0003-Modifiy-entity.patch
View File

@ -1,4 +1,4 @@
From 6f2d4044c42164123ee32a1ed1145dfaa4d6c791 Mon Sep 17 00:00:00 2001
From 90e32385d69e8936969ac3e7e7b2cd52f2d19e28 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 23 Oct 2015 21:16:07 +1300
Subject: [PATCH] Modifiy entity

2
Patches/CraftBukkit-Patches/0004-Chunk-changes.patch
View File

@ -1,4 +1,4 @@
From 4d40b0d15f3119905621a94dbb8ac7053bcb5e08 Mon Sep 17 00:00:00 2001
From 72e734acdc1912563f5d8e4a906579e3ab65064b Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 23 Oct 2015 21:21:32 +1300
Subject: [PATCH] Chunk changes

2
Patches/CraftBukkit-Patches/0005-Packet-listener-changes.patch
View File

@ -1,4 +1,4 @@
From a26be74b90cadee21f54f5870a104bacf4bb35d6 Mon Sep 17 00:00:00 2001
From 1da9bcc60b080e3b068aff9202dbe7823d1abe64 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 23 Oct 2015 21:22:05 +1300
Subject: [PATCH] Packet listener changes

2
Patches/CraftBukkit-Patches/0006-Inventory-changes.patch
View File

@ -1,4 +1,4 @@
From 2aeb61915b582f47390a1c5f9f030684584e36df Mon Sep 17 00:00:00 2001
From bf6cbe47c5b1ab50e4ceb7a98b25975b90ae92c2 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 23 Oct 2015 21:22:36 +1300
Subject: [PATCH] Inventory changes

2
Patches/CraftBukkit-Patches/0007-Misc-changes.patch
View File

@ -1,4 +1,4 @@
From ff3ea9c451b175bf874d472657ac08508d688b92 Mon Sep 17 00:00:00 2001
From ed2a06418ba178cb6ff227ef1aca14f7b5f951df Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 23 Oct 2015 21:23:00 +1300
Subject: [PATCH] Misc changes

2
Patches/CraftBukkit-Patches/0008-EntityGuardian-is-now-vegetateable.patch
View File

@ -1,4 +1,4 @@
From 8230ca7c899ba6cd065c7be4971072b6ce6b3fba Mon Sep 17 00:00:00 2001
From 562c6e8165bebbabc22f7f1d472e1fc0bf54dc86 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Wed, 28 Oct 2015 09:00:24 +1300
Subject: [PATCH] EntityGuardian is now vegetateable

2
Patches/CraftBukkit-Patches/0009-Controller-look-vegetateHead-Entity-collide-changes.patch
View File

@ -1,4 +1,4 @@
From 9fbfbcb4824fa9bb505fbef4f419dd9c99f42081 Mon Sep 17 00:00:00 2001
From 5455de50dc5b6fe4ea5ba5b98b0f9169705a0e65 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 30 Oct 2015 20:02:58 +1300
Subject: [PATCH] Controller look vegetateHead, Entity collide changes

2
Patches/CraftBukkit-Patches/0010-Vegetate-head-ai.patch
View File

@ -1,4 +1,4 @@
From 9a1fa6cc1d76f99db1bd4b15986536d211ac253f Mon Sep 17 00:00:00 2001
From 9f6ec15bfe47f1860d878212035f477b5b253c63 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Tue, 3 Nov 2015 21:21:02 +1300
Subject: [PATCH] Vegetate head ai

2
Patches/CraftBukkit-Patches/0011-Modifications-to-cb.patch
View File

@ -1,4 +1,4 @@
From 21e5563a3896130f07b496fef4595f0235755d3a Mon Sep 17 00:00:00 2001
From a50aa59123b6a4b164fe368c83dbdd426dba0f6e Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Sun, 8 Nov 2015 17:57:05 +1300
Subject: [PATCH] Modifications to cb

2
Patches/CraftBukkit-Patches/0012-Add-IEntitySelector-have-isGhost-return-the-same-as-.patch
View File

@ -1,4 +1,4 @@
From ac1133b66c5ce541261f62ec0c11b3886ea30a98 Mon Sep 17 00:00:00 2001
From 9d2015fe106bc67d93ea1d9a80d057f1bfad0fd0 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Mon, 9 Nov 2015 00:07:26 +1300
Subject: [PATCH] Add IEntitySelector, have isGhost() return the same as

2
Patches/CraftBukkit-Patches/0013-Add-player-spectator.patch
View File

@ -1,4 +1,4 @@
From 5c30227b0b7afb779eb9ef2836a74399eb52d54b Mon Sep 17 00:00:00 2001
From 436b55243d79c6ae0d839a2666a2f43ed186fe70 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Mon, 9 Nov 2015 00:13:21 +1300
Subject: [PATCH] Add player spectator

2
Patches/CraftBukkit-Patches/0014-Fixed-ai-typo.patch
View File

@ -1,4 +1,4 @@
From 64bc89fa38dd6e6e7fe7ae0ec6acaa307aa04587 Mon Sep 17 00:00:00 2001
From b1e36dc87d3c5623283c9f461807a65d40538be3 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Mon, 9 Nov 2015 02:41:31 +1300
Subject: [PATCH] Fixed ai typo

2
Patches/CraftBukkit-Patches/0015-Fix-casting-bug.patch
View File

@ -1,4 +1,4 @@
From 9162e9ac03c43c19b9a77659cfe3c8122a356f45 Mon Sep 17 00:00:00 2001
From 838463c93cd7f0b29814507cab9e7c3465e75bbb Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Wed, 11 Nov 2015 00:21:54 +1300
Subject: [PATCH] Fix casting bug

2
Patches/CraftBukkit-Patches/0016-Fix-schedulers.patch
View File

@ -1,4 +1,4 @@
From 190c9ab2ac576ab58f2c44724720c7c6f38a0bb4 Mon Sep 17 00:00:00 2001
From e1d672bf80a66283809f25f925121487cc02e040 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Wed, 11 Nov 2015 11:43:17 +1300
Subject: [PATCH] Fix schedulers

2
Patches/CraftBukkit-Patches/0017-EntityDismountEvent-teleport-crash-fix.patch
View File

@ -1,4 +1,4 @@
From b65ae80e1e33609ba8b85c51484d196e57c0a75f Mon Sep 17 00:00:00 2001
From 08847caa91ab71f3a67bbb4bef1ebd00acac6f6a Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Sun, 22 Nov 2015 14:41:11 +1300
Subject: [PATCH] EntityDismountEvent & teleport crash fix

2
Patches/CraftBukkit-Patches/0018-Server-freezing-fix-fake-yaw-pitch.patch
View File

@ -1,4 +1,4 @@
From a9d47c79c8fa04a9bbc9dedd40a90d68db6cdbe1 Mon Sep 17 00:00:00 2001
From 76027e46da8c636f0c59912ce06379373880862c Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 27 Nov 2015 22:26:34 +1300
Subject: [PATCH] Server freezing, fix fake yaw/pitch

2
Patches/CraftBukkit-Patches/0019-Sound-and-vehicle-fixes.patch
View File

@ -1,4 +1,4 @@
From 24835060e661f49f73e7df5303ace557c371600a Mon Sep 17 00:00:00 2001
From c97267c98bac90ee24f0bb7bfa710a58f3c990af Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Tue, 12 Jan 2016 19:56:07 +1300
Subject: [PATCH] Sound and vehicle fixes

2
Patches/CraftBukkit-Patches/0020-md_5-s-player-interaction-for-specs-patch.patch
View File

@ -1,4 +1,4 @@
From 0d3d36d15a25f940ee337193db1be15100dfafca Mon Sep 17 00:00:00 2001
From fd52634ee952e6c24f5d874d4130abae2524ac39 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 29 Jan 2016 16:59:00 +1300
Subject: [PATCH] md_5's player interaction for specs patch

2
Patches/CraftBukkit-Patches/0021-Fix-enderman-teleporting-when-vegetated.patch
View File

@ -1,4 +1,4 @@
From 34d8235fcf6c025501f6f3c9a45001fd03abde5e Mon Sep 17 00:00:00 2001
From 967ca8d8c01a90f93d52bd9aa2bbe1e9d2fd7a66 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Fri, 29 Jan 2016 16:59:12 +1300
Subject: [PATCH] Fix enderman teleporting when vegetated

2
Patches/CraftBukkit-Patches/0022-Implement-Sentry-for-exception-monitoring.patch
View File

@ -1,4 +1,4 @@
From 78a0d13d477cac46e168c9a4e6d5e1be58b6df2a Mon Sep 17 00:00:00 2001
From 87e9cd7cd56efee729c47710a8b1d9ed265c8903 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 7 Feb 2016 20:28:54 +1100
Subject: [PATCH] Implement Sentry for exception monitoring.

2
Patches/CraftBukkit-Patches/0023-Dual-version-patch-and-some-other-fixes.patch
View File

@ -1,4 +1,4 @@
From e5e4a814b2e58b270a96a6df54c5fa70aa7383f7 Mon Sep 17 00:00:00 2001
From b764e7185cb062f830a74b814017b148a062a59a Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Sun, 29 Nov 2015 02:53:00 +1300
Subject: [PATCH] Dual version patch and some other fixes

2
Patches/CraftBukkit-Patches/0024-Added-new-stuff-elytra-and-levitation.patch
View File

@ -1,4 +1,4 @@
From 2cbd4df1cf40507039fc257cb63b38e4c1d4e696 Mon Sep 17 00:00:00 2001
From 78251d4e835e96e8119c0f0ce87ad915339f5093 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Wed, 30 Dec 2015 21:06:12 +1300
Subject: [PATCH] Added new stuff, elytra and levitation

2
Patches/CraftBukkit-Patches/0025-Some-debug-and-crash-fixes.patch
View File

@ -1,4 +1,4 @@
From 60a8f28606242203309f8463ae55877662d7f0b5 Mon Sep 17 00:00:00 2001
From 4374ab4f758cd98b874600ad6c2b5c1474135a93 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Wed, 30 Dec 2015 22:38:30 +1300
Subject: [PATCH] Some debug and crash fixes

2
Patches/CraftBukkit-Patches/0026-Current-patch-stuff.patch
View File

@ -1,4 +1,4 @@
From 8bd7212efd01da635ecdbbdcba592cf9bf01852f Mon Sep 17 00:00:00 2001
From 7c7c941e8a0275a063065f592d57db5bdc103db8 Mon Sep 17 00:00:00 2001
From: git <libraryaddict115@yahoo.co.nz>
Date: Thu, 25 Feb 2016 18:20:02 +1300
Subject: [PATCH] Current patch stuff

2
Patches/CraftBukkit-Patches/0027-Changed-maven-version-fixed-entity-movement-fixed-so.patch
View File

@ -1,4 +1,4 @@
From 8be28455a0a9255919d6761afaf72fe88a318aee Mon Sep 17 00:00:00 2001
From 9dfce5478dba231619b0527f28af3640aef5480c Mon Sep 17 00:00:00 2001
From: git <libraryaddict115@yahoo.co.nz>
Date: Sun, 28 Feb 2016 00:37:30 +1300
Subject: [PATCH] Changed maven version, fixed entity movement, fixed sound

2
Patches/CraftBukkit-Patches/0028-Update-to-1.9-fix-blocking.patch
View File

@ -1,4 +1,4 @@
From 9050e6152e74ce2ef977b05cfe3b76678fb073fb Mon Sep 17 00:00:00 2001
From 6e5d8f23968f7b24c084816f2b55edfbc99e820f Mon Sep 17 00:00:00 2001
From: git <libraryaddict115@yahoo.co.nz>
Date: Tue, 1 Mar 2016 09:29:32 +1300
Subject: [PATCH] Update to 1.9, fix blocking

29
Patches/CraftBukkit-Patches/0029-Fix-TnT-Datawatcher.patch Normal file
View File

@ -0,0 +1,29 @@
From 6e7c7edf9e6144385bc909b17dd14539d8ac98d6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
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

BIN
Patches/craftbukkit.jar
View File

Binary file not shown.