Commit Graph

2749 Commits

Author SHA1 Message Date
Shane Freeder
2104c3a683
Update CB/S 2017-09-09 08:17:12 +01:00
Zach Brown
a0cd14a34c
Rebuild patches 2017-09-06 22:59:08 -04:00
CDAGaming
15a47148c7 Update CB & B (#876) 2017-09-06 12:31:37 -04:00
Shane Freeder
3baf14a8ec
Rebuild patches 2017-09-03 01:09:35 +01:00
CDAGaming
f520871b4f Update CB and B (#873) 2017-09-02 14:01:45 -04:00
CDAGaming
d375188e15 Update CB 2017-08-31 17:38:48 -05:00
CDAGaming
40426d52ad Update Bukkit 2017-08-26 11:27:46 -05:00
BillyGalbreath
75cb198fd2
LivingEntity#setKiller 2017-08-24 15:19:29 -04:00
Zach
5c94603f46 Merge pull request #861 from CDAGaming/master
Update CB and BD
2017-08-23 11:16:32 -04:00
CDAGaming
84c2351e37 Update CB and BD 2017-08-23 09:13:12 -05:00
kashike
85c6f826e4 Deprecate usages of authlib
ref #828
2017-08-22 19:12:34 -07:00
Shane Freeder
48d8add662
Update B 2017-08-20 11:50:29 +01:00
kashike
d43da9fc70 Allow specifying a custom "authentication servers down" kick message
Thanks to @phenomax in #855
2017-08-17 16:16:44 -07:00
Shane Freeder
4368f412c6
Update CB 2017-08-16 16:47:06 +01:00
Zach Brown
a8c70655c0
Update paperclip script for folder move 2017-08-13 15:44:27 -05:00
Zach Brown
9ff170660b
Move mc decompile source to its own folder
Makes caching easier, ever so slightly more organized.
2017-08-12 18:56:59 -05:00
Zach Brown
cb011c365e
Hi my name is Travis-CI and I'm high maintenance 2017-08-12 18:28:14 -05:00
Shane Freeder
d77731eee2
Update S 2017-08-12 22:51:29 +01:00
Shane Freeder
225bfcff56
[CI-SKIP] Travis: linux sudo vm's have more ram, also stop travis screwing with the git modules 2017-08-12 21:15:37 +01:00
Zach
b22423be8b Merge pull request #853 from Brokkonaut/dragon-egg-falling
I forgot the // Paper comment
2017-08-11 21:39:54 -05:00
Brokkonaut
fe8ce33ef5 I forgot the // Paper comment 2017-08-12 02:23:35 +02:00
Zach Brown
bab98cf5ff
Don't let Player#getLocale return null
Thanks for reporting @MatrixTunnel
2017-08-11 18:16:00 -05:00
Zach Brown
a8508dc5df
Remove null values in TileEntity tick list
Because who wouldn't want to tick a null tile entity right?
Fixes GH-851
2017-08-11 17:59:44 -05:00
Shane Freeder
912ee23e25
Update CB 2017-08-11 13:05:23 +01:00
Zach Brown
98d8483c7a
Skip paperclip step on Travis-CI 2017-08-10 21:14:10 -05:00
Zach Brown
3338148247
Start using Travis-CI again
The only way to get Paper to build, specifically past the jar remap
step, is to use a macOS host. Don't ask me why, I'm just the messenger.
2017-08-10 21:07:41 -05:00
Zach Brown
0181286eb9
Fix MC-117075: TE Unload Lag Spike
PaperMC port of https://github.com/MinecraftForge/MinecraftForge/pull/4281
2017-08-10 21:06:53 -05:00
Shane Freeder
4d3e4470b4 Merge pull request #849 from Brokkonaut/dragon-egg-falling
MC-94186 Fix dragon egg falling in lazy chunks
2017-08-11 02:54:29 +01:00
Brokkonaut
c84dd9edfe MC-94186 Fix dragon egg falling in lazy chunks
Fixes falling dragon eggs in lazy chunks fall to the block below the last empty block and replacing that block with them.

See also https://bugs.mojang.com/browse/MC-94186
2017-08-11 03:36:59 +02:00
Shane Freeder
42faa9e529 Update CB (#846) 2017-08-09 14:44:28 -04:00
BillyGalbreath
6f32c51336 Ocelot despawns should honor nametags and leash (#821) 2017-08-07 23:26:44 -04:00
BillyGalbreath
128c35000b Reset spawner timer when spawner event is cancelled (#819) 2017-08-07 23:25:59 -04:00
chickeneer
52c8fc7633 Fix Nether Portal Creation on cancelled event
Spigot is manipulating the Travel Agents canCreatePortal, but forgot to reset it on cancel

This causes nether portals to not be generated if the event is ever cancelled
2017-08-07 23:08:50 -04:00
Aikar
ff5bd7b03b Upstream update 2017-08-07 23:05:16 -04:00
kashike
5ac8a3f491 Merge pull request #842 from DemonWav/feature/speedup
Fix this stupid bullshit
2017-08-06 15:41:49 -07:00
DemonWav
1ff893abe1
Fix this stupid bullshit 2017-08-06 17:18:20 -05:00
Zach
ab6f5deb59 Merge pull request #840 from electronicboy/master
fix construction order in CraftBanner
2017-08-06 10:42:52 -05:00
Shane Freeder
efe49baecf
fix construction order in CraftBanner 2017-08-06 16:36:48 +01:00
kashike
7f38d169dc Merge pull request #837 from electronicboy/mergy
Update B/CB/S
2017-08-05 16:36:44 -07:00
Shane Freeder
bec1253aa9
Update B/CB/S 2017-08-06 00:08:21 +01:00
Zach Brown
f7e23ba7fa
Update upstream CB 2017-08-04 22:10:30 -05:00
kashike
1b363377f7 Merge pull request #830 from Minecrell/jline-3.4.0
Update JLine to 3.4.0
2017-08-04 08:09:42 -07:00
Minecrell
9f3f6e02a6 Update JLine to 3.4.0. Fixes #736 2017-08-04 09:15:09 +02:00
kashike
7962fe6489 Merge pull request #827 from Black-Hole/1.12.1
Update to 1.12.1
2017-08-03 08:43:21 -07:00
BlackHole
6879328bf6 Update to 1.12.1 2017-08-03 17:27:54 +02:00
kashike
2e157dd1b4 Merge pull request #822 from BillyGalbreath/Plugins-list-alphabatized
Make /plugins list alphabetical
2017-07-31 19:39:42 -07:00
BillyGalbreath
2670d1f8eb Make /plugins list alphabetical 2017-07-31 02:09:13 -05:00
Aikar
cdd6d8562a Update Upstream 2017-07-30 18:41:08 -04:00
kashike
051c0b5898 Merge pull request #812 from electronicboy/upstream
Update B/CB
2017-07-28 08:47:48 -07:00
Shane Freeder
fed4815fff
Update B/CB 2017-07-28 15:51:46 +01:00