Commit graph

2858 commits

Author SHA1 Message Date
Shane Freeder
9f7b45a945 Update CB, refactor 0229-Fix-this-stupid-bullshit
Refactored 0229-Fix-this-stupid-bullshit in order to prevent merge conflicts
when spigot decides to update the timer and to provide some form of hint in the
console/log on startup.
2017-09-15 15:37:05 +01:00
Shane Freeder
0ccfc595a4 Cache generated EventExecutors (fixes #786)
the first 'major' change in this PR is to cache the generated event
executrs from the ASM class, by doing this we only generate a single
class for every method that we need an executor for, thus reducing the
number of classes that are needed, especially in cases where plugins
re/unregister events all the time.

The second change is to modify the generated classloader map, generated
classloaders are not held against the plugin itself but the classloader
that the event is declared in, the implication here is that we cannot
drop generated classloaders when a plugin disable, and so we use a guava
weak-key'd hashmap, downfall here is that classes won't be GC'd until
guava drops the generated classloader, however the first change should
deal with most of the grunt.
2017-09-06 21:18:36 +01:00
Zach Brown
fe190b78a1 Fix race condition with chunks, dead tile entities
Fixes PaperMC/Paper#883 same issue as MinecraftForge/MinecraftForge#4386

A more detailed anaylsis of what is probably going on, courtesy of
@bs2609 and the MCForge Issue Tracker is:

When a chunk is unloaded, the entities and tile entities it contains are
marked for removal. The actual removal (from the world) occurs later,
when the world ticks its entities.
Conversely, when a chunk is loaded, it generally adds its entities to
the world promptly, without queuing.

Here's the normal sequence of events:

Chunk unloaded
Old entities removed
Chunk loaded
New entities added

However, what can happen:

Chunk unloaded
Chunk loaded
New entities added
Old entities removed

This occurs when an unloaded chunk is reloaded before its corresponding
entities have been removed.
2017-09-11 22:21:57 -04:00
Shane Freeder
89e69d652f Update CB/S 2017-09-09 08:17:12 +01:00
Zach Brown
4424c3dec9 Rebuild patches 2017-09-06 22:59:08 -04:00
CDAGaming
d8c452b7e9 Update CB & B (#876) 2017-09-06 11:31:37 -05:00
Shane Freeder
ada06c9e99 Rebuild patches 2017-09-03 01:09:35 +01:00
CDAGaming
4d87864e6e Update CB and B (#873) 2017-09-02 13:01:45 -05:00
CDAGaming
0e3ea47b9f Update CB 2017-08-31 17:38:48 -05:00
CDAGaming
6c6ebe9236 Update Bukkit 2017-08-26 11:27:46 -05:00
BillyGalbreath
8fc7933953 LivingEntity#setKiller 2017-08-24 15:18:41 -04:00
Zach Brown
c3cdafc48d Merge pull request #861 from CDAGaming/master
Update CB and BD
2017-08-23 11:16:32 -04:00
CDAGaming
dbcc462822 Update CB and BD 2017-08-23 09:13:12 -05:00
Riley Park
b90a8b6df4 Deprecate usages of authlib
ref #828
2017-08-22 19:08:41 -07:00
Shane Freeder
e78847f843 Update B 2017-08-20 11:50:29 +01:00
Riley Park
cc7b5ac739 Allow specifying a custom "authentication servers down" kick message
Thanks to @phenomax in #855
2017-08-17 16:13:22 -07:00
Shane Freeder
7fc4d26c3f Update CB 2017-08-16 16:47:06 +01:00
Zach Brown
7a4c06e567 Update paperclip script for folder move 2017-08-13 15:44:27 -05:00
Zach Brown
67f96885aa 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
41622f3491 Hi my name is Travis-CI and I'm high maintenance 2017-08-12 18:28:14 -05:00
Shane Freeder
a6eb798352 Update S 2017-08-12 22:32:01 +01:00
Shane Freeder
dfd39f99e6 [CI-SKIP] Travis: linux sudo vm's have more ram, also stop travis screwing with the git modules 2017-08-12 00:22:44 +01:00
Zach Brown
7a01df109a Merge pull request #853 from Brokkonaut/dragon-egg-falling
I forgot the // Paper comment
2017-08-11 21:39:54 -05:00
Brokkonaut
db39b99f26 I forgot the // Paper comment 2017-08-12 02:23:35 +02:00
Zach Brown
73f04c4828 Don't let Player#getLocale return null
Thanks for reporting @MatrixTunnel
2017-08-11 18:16:00 -05:00
Zach Brown
e70452db81 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
4bf6691021 Update CB 2017-08-11 12:02:53 +01:00
Zach Brown
e0d4db2507 Skip paperclip step on Travis-CI 2017-08-10 21:14:10 -05:00
Brokkonaut
3c154072d3 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:32:07 +02:00
Zach Brown
d5815ee8a4 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 20:26:00 -05:00
Zach Brown
b8cda19a77 Fix MC-117075: TE Unload Lag Spike
PaperMC port of https://github.com/MinecraftForge/MinecraftForge/pull/4281
2017-08-09 18:11:57 -05:00
Shane Freeder
efe076defb 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
Shane Freeder
fbeadaefff Update CB (#846) 2017-08-09 19:44:28 +01:00
BillyGalbreath
19afa58c90 Ocelot despawns should honor nametags and leash (#821) 2017-08-07 22:26:44 -05:00
BillyGalbreath
568f82f3f8 Reset spawner timer when spawner event is cancelled (#819) 2017-08-07 22:25:59 -05:00
chickeneer
0e9f94b07a 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
64b2b87256 Upstream update 2017-08-07 23:05:16 -04:00
Riley Park
96911e196f Merge pull request #842 from DemonWav/feature/speedup
Fix this stupid bullshit
2017-08-06 15:41:49 -07:00
DemonWav
2b47debe1e Fix this stupid bullshit 2017-08-06 17:18:20 -05:00
Zach Brown
96655d6f35 Merge pull request #840 from electronicboy/master
fix construction order in CraftBanner
2017-08-06 10:42:52 -05:00
Shane Freeder
23d7d25afe fix construction order in CraftBanner 2017-08-06 16:36:48 +01:00
Riley Park
50fa0bb477 Merge pull request #837 from electronicboy/mergy
Update B/CB/S
2017-08-05 16:36:44 -07:00
Shane Freeder
2c4293b0f6 Update B/CB/S 2017-08-05 23:36:47 +01:00
Zach Brown
04e2290f72 Update upstream CB 2017-08-04 22:10:30 -05:00
Riley Park
5b9437e6e2 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
b0f800f0e2 Update JLine to 3.4.0. Fixes #736 2017-08-04 09:15:09 +02:00
Riley Park
048d9077b7 Merge pull request #827 from Black-Hole/1.12.1
Update to 1.12.1
2017-08-03 08:43:21 -07:00
BlackHole
01d1cc351b Update to 1.12.1 2017-08-03 16:36:06 +02:00
Riley Park
644f1e6e30 Merge pull request #822 from BillyGalbreath/Plugins-list-alphabatized
Make /plugins list alphabetical
2017-07-31 19:39:42 -07:00
BillyGalbreath
0ab8f79870 Make /plugins list alphabetical 2017-07-31 02:09:13 -05:00