Skip to content

Commit 12a80ca

Browse files
authored
Do not call getViewer() on open in shared contexts (#545)
1 parent abb7508 commit 12a80ca

File tree

5 files changed

+20
-26
lines changed

5 files changed

+20
-26
lines changed

inventory-framework-anvil-input/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ plugins {
66
apply from: '../library.gradle'
77
apply from: '../publish.gradle'
88

9-
repositories {
10-
mavenCentral()
11-
maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
12-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
13-
14-
}
15-
169
dependencies {
1710
compileOnly libs.spigot
1811
compileOnlyApi projects.inventoryFrameworkPlatformBukkit

inventory-framework-platform-bukkit/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ plugins {
88
apply from: '../library.gradle'
99
apply from: '../publish.gradle'
1010

11-
repositories {
12-
mavenCentral()
13-
maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
14-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
15-
}
16-
1711
dependencies {
1812
api projects.inventoryFrameworkPlatform
1913
runtimeOnly projects.inventoryFrameworkAnvilInput

inventory-framework-platform/src/main/java/me/devnatan/inventoryframework/pipeline/PlatformOpenInterceptor.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,26 @@ IFRenderContext createRenderContext(IFOpenContext openContext) {
7474
ViewContainer createdContainer = openContext.getContainer();
7575
if (createdContainer == null) createdContainer = elementFactory.createContainer(openContext);
7676

77-
final IFRenderContext context = elementFactory.createRenderContext(
77+
final IFRenderContext renderContext = elementFactory.createRenderContext(
7878
openContext.getId(),
7979
root,
8080
openContext.getConfig(),
8181
createdContainer,
8282
new HashMap<>(),
83-
openContext.getViewer(),
83+
openContext.isShared() ? null : openContext.getViewer(),
8484
openContext.getInitialData());
8585

86-
context.setEndless(openContext.isEndless());
87-
openContext.getStateValues().forEach(context::initializeState);
86+
renderContext.setEndless(openContext.isEndless());
87+
openContext.getStateValues().forEach(renderContext::initializeState);
8888

8989
for (final Viewer viewer : openContext.getIndexedViewers().values()) {
90-
if (!viewer.isTransitioning()) viewer.setActiveContext(context);
90+
if (!viewer.isTransitioning()) viewer.setActiveContext(renderContext);
9191
// TODO Pass viewer object as parameter instead
92-
root.onViewerAdded(context, viewer.getPlatformInstance(), context.getInitialData());
93-
context.addViewer(viewer);
92+
root.onViewerAdded(renderContext, viewer.getPlatformInstance(), renderContext.getInitialData());
93+
renderContext.addViewer(viewer);
9494
}
9595

96-
context.setActive(true);
97-
return context;
96+
renderContext.setActive(true);
97+
return renderContext;
9898
}
9999
}

library.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ apply plugin: 'com.diffplug.spotless'
44
group rootProject.group
55
version rootProject.version
66

7-
repositories {
8-
mavenCentral()
9-
}
10-
117
dependencies {
128
compileOnly libs.jetbrains.annotations
139
testCompileOnly libs.jetbrains.annotations

settings.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
buildscript {
2+
dependencyResolutionManagement {
3+
repositories {
4+
mavenCentral()
5+
maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
6+
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
7+
maven { url 'https://repo.papermc.io/repository/maven-public/' }
8+
}
9+
}
10+
}
11+
112
plugins {
213
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
314
}

0 commit comments

Comments
 (0)